diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index a91aa54e3..137415276 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/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 赋值 /// @@ -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 CheckBalanceAsync(UnplannedIssueRequestImportInput importInput, List 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 validationRresult) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs index e96472a85..5edae692f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs +++ b/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 赋值 /// @@ -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 CheckBalanceAsync(UnplannedReceiptRequestImportInput importInput, List 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 validationRresult) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs index a789ae41a..08d2375e3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs @@ -35,26 +35,4 @@ public class UnplannedIssueRequestManager : SfsStoreRequestManagerBase> CreateManyAsync(List 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); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs index 3904b6435..b68cb4fe8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs @@ -35,26 +35,4 @@ public class UnplannedReceiptRequestManager : SfsStoreRequestManagerBase> CreateManyAsync(List 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); - } }