修改校验

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs

@@ -59,24 +59,6 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
         return dictionary;
     }
 
-    #region 校验
-    private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
-    {
-        if (itemBasicDto == null)
-        {
-            throw new UserFriendlyException($"物品代码为【{itemCode}】不存在");
-        }
-    }
-
-    private void CheckLocation(LocationDTO locationDto, string locationCode)
-    {
-        if (locationDto == null)
-        {
-            throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
-        }
-    }
-    #endregion
-
     #region 赋值
 
     /// <summary>
@@ -221,6 +203,22 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
 
     #region 校验
 
+    private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
+    {
+        if (itemBasicDto == null)
+        {
+            throw new UserFriendlyException($"物品代码为【{itemCode}】不存在");
+        }
+    }
+
+    private void CheckLocation(LocationDTO locationDto, string locationCode)
+    {
+        if (locationDto == null)
+        {
+            throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
+        }
+    }
+
     protected async Task<BalanceDTO> CheckBalanceAsync(UnplannedIssueRequestImportInput importInput, List<ValidationResult> validationRresult)
     {
         var balance = await BalanceAclService.GetByItemLocationAndPackingAsync(
@@ -263,8 +261,16 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
                         validationRresult.Add(new ValidationResult($"专案代码{importInput.CaseCode}不存在", new string[] { "专案代码" }));
                     }
                 }
+                else
+                {
+                    validationRresult.Add(new ValidationResult($"字典编码{nameof(importInput.CaseCode)}不存在", new string[] { "字典编码" }));
+                }
             }
         }
+        else
+        {
+            validationRresult.Add(new ValidationResult($"专案不能为空"));
+        }
     }
 
     protected override async Task ValidateImportModelAsync(UnplannedIssueRequestImportInput model, List<ValidationResult> validationRresult)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs

@@ -55,24 +55,6 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
         return dictionary;
     }
 
-    #region 校验
-    private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
-    {
-        if (itemBasicDto == null)
-        {
-            throw new UserFriendlyException($"物品代码为【{itemCode}】不存在");
-        }
-    }
-
-    private void CheckLocation(LocationDTO locationDto, string locationCode)
-    {
-        if (locationDto == null)
-        {
-            throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
-        }
-    }
-    #endregion
-
     #region 赋值
 
     /// <summary>
@@ -200,6 +182,21 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
 
     #region 校验
 
+    private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
+    {
+        if (itemBasicDto == null)
+        {
+            throw new UserFriendlyException($"物品代码为【{itemCode}】不存在");
+        }
+    }
+
+    private void CheckLocation(LocationDTO locationDto, string locationCode)
+    {
+        if (locationDto == null)
+        {
+            throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
+        }
+    }
     protected virtual async Task<BalanceDTO> CheckBalanceAsync(UnplannedReceiptRequestImportInput importInput, List<ValidationResult> validationRresult)
     {
         var balance = await BalanceAclService.GetByItemLocationAndPackingAsync(
@@ -230,7 +227,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
 
             if (dict == null)
             {
-                validationRresult.Add("字典编码", $"字典编码{nameof(importInput.CaseCode)}不存在");
+                validationRresult.Add(new ValidationResult($"字典编码{nameof(importInput.CaseCode)}不存在", new string[] { "字典编码" }));
             }
             else
             {
@@ -239,11 +236,19 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
                     var item = dict.Items.FirstOrDefault(t => t.Code == importInput.CaseCode);
                     if (item == null)
                     {
-                        validationRresult.Add("专案代码", $"专案代码{importInput.CaseCode}不存在");
+                        validationRresult.Add(new ValidationResult($"专案代码{importInput.CaseCode}不存在", new string[] { "专案代码" }));
                     }
                 }
+                else
+                {
+                    validationRresult.Add(new ValidationResult($"字典编码{nameof(importInput.CaseCode)}不存在", new string[] { "字典编码" }));
+                }
             }
         }
+        else
+        {
+            validationRresult.Add(new ValidationResult($"专案不能为空"));
+        }
     }
 
     protected virtual async Task CheckImportInputBusinessAsync(UnplannedReceiptRequestImportInput importInput, EnumImportMethod importMethod, List<ValidationResult> validationRresult)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs

@@ -35,26 +35,4 @@ public class UnplannedIssueRequestManager : SfsStoreRequestManagerBase<Unplanned
 
         await CreateManyAsync(mergeEntities).ConfigureAwait(false);
     }
-
-    public override async Task<List<UnplannedIssueRequest>> CreateManyAsync(List<UnplannedIssueRequest> entities)
-    {
-        var dictDto = await _dictAppService.GetByCodeAsync("CaseCode").ConfigureAwait(false);
-
-        foreach (var entity in entities)
-        {
-            foreach (var unplannedIssueRequestDetail in entity.Details)
-            {
-                var flag = dictDto.Items.ToList().FirstOrDefault(p => p.Value == unplannedIssueRequestDetail.CaseCode);
-                if (flag == null)
-                {
-                    throw new UserFriendlyException($"【{unplannedIssueRequestDetail.CaseCode}】专案不存在");
-                }
-
-                var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(unplannedIssueRequestDetail.ItemCode).ConfigureAwait(false);
-                unplannedIssueRequestDetail.Uom = itemBasicDto.BasicUom;
-            }
-        }
-
-        return await base.CreateManyAsync(entities).ConfigureAwait(false);
-    }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs

@@ -35,26 +35,4 @@ public class UnplannedReceiptRequestManager : SfsStoreRequestManagerBase<Unplann
 
         await CreateManyAsync(mergeEntities).ConfigureAwait(false);
     }
-
-    public override async Task<List<UnplannedReceiptRequest>> CreateManyAsync(List<UnplannedReceiptRequest> entities)
-    {
-        var dictDto= await _dictAppService.GetByCodeAsync("CaseCode").ConfigureAwait(false);
-
-        foreach (var entity in entities)
-        {
-            foreach (var unplannedReceiptRequestDetail in entity.Details)
-            {
-                var flag= dictDto.Items.ToList().FirstOrDefault(p => p.Value == unplannedReceiptRequestDetail.CaseCode);
-                if (flag == null)
-                {
-                    throw new UserFriendlyException($"【{unplannedReceiptRequestDetail.CaseCode}】专案不存在");
-                }
-
-                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(unplannedReceiptRequestDetail.ItemCode).ConfigureAwait(false);
-                unplannedReceiptRequestDetail.Uom = itemBasicDto.BasicUom;
-            }
-        }
-
-        return await base.CreateManyAsync(entities).ConfigureAwait(false);
-    }
 }