Merge branch 'master' into kitchenmanage

BPA.SAAS.Manage.Application/Device/Services/DeviceVesionService.cs

@@ -245,9 +245,36 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     ActionValue = "",
                     IsDefault = true
                 };
+                var goodsProductFunctionActionlist_reply = new BPA_ProductFunctionAction()
+                {
+                    ActionType = "textareaary",
+                    ProductFunctionId = goodsProductFunction_reply.Id,
+                    ActionName = "DataSoure",
+                    ActionValue = "",
+                    IsDefault = true
+                };
+                var batchingProductFunctionActionlist_reply = new BPA_ProductFunctionAction()
+                {
+                    ActionType = "textareaary",
+                    ProductFunctionId = batchingProductFunction_reply.Id,
+                    ActionName = "DataSoure",
+                    ActionValue = "",
+                    IsDefault = true
+                };
+                var chnologyProductFunctionActionlist_reply = new BPA_ProductFunctionAction()
+                {
+                    ActionType = "textareaary",
+                    ProductFunctionId = chnologyProductFunction_reply.Id,
+                    ActionName = "DataSoure",
+                    ActionValue = "",
+                    IsDefault = true
+                };
                 ProductFunctionActionlist.Add(goodsProductFunctionActionlist);
                 ProductFunctionActionlist.Add(batchingProductFunctionActionlist);
                 ProductFunctionActionlist.Add(chnologyProductFunctionActionlist);
+                ProductFunctionActionlist.Add(goodsProductFunctionActionlist_reply);
+                ProductFunctionActionlist.Add(batchingProductFunctionActionlist_reply);
+                ProductFunctionActionlist.Add(chnologyProductFunctionActionlist_reply);
                 await _db.Insertable(ProductFunctionActionlist).CallEntityMethod(m => m.Create()).ExecuteCommandAsync();
                 #endregion
                 _db.Ado.CommitTran();

BPA.SAAS.Manage.Application/Device/Services/ProductFunctionService.cs

@@ -250,7 +250,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
         public async Task<bool> AddProductFunctionAction(ProductFunctionActionBaseDto inputDto)
         {
             var check = _db.Queryable<BPA_ProductFunctionAction>()
-                .Any(a => a.ProductFunctionId == inputDto.ProductFunctionId && a.IsDeleted == 0 && a.ActionName == inputDto.ActionName && a.ActionType == inputDto.ActionType);
+                .Any(a => a.ProductFunctionId == inputDto.ProductFunctionId && a.ActionName == inputDto.ActionName );
             if (check)
             {
                 throw Oops.Oh("功能参数已存在");