From 24df9842ac5133926f684b35868683c390cbec7a Mon Sep 17 00:00:00 2001 From: mahao Date: Wed, 26 Apr 2023 11:29:06 +0800 Subject: [PATCH] =?UTF-8?q?Check=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductReceiptRequestAppService.cs | 22 +++++++++++++++++-- .../ProductRecycleRequestAppService.cs | 14 +++++++++--- .../ScrapRequests/ScrapRequestAppService.cs | 2 ++ .../TransferRequestAppService.cs | 1 + ...lannedIssueRequestForDongyangAppService.cs | 22 +++++++++++++++++-- ...nnedReceiptRequestForDongyangAppService.cs | 22 +++++++++++++++++-- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAppService.cs index f6c44ac51..1d1e0215a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAppService.cs @@ -82,6 +82,24 @@ public class ProductReceiptRequestAppService : 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 + /// /// 赋值详情 /// @@ -90,7 +108,7 @@ public class ProductReceiptRequestAppService : private async Task SetDetailPropertiesAsync(ProductReceiptRequestDetail detail) { var itemBasic = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); - + CheckItemBasic(itemBasic, detail.ItemCode); if (itemBasic != null) { detail.ItemName = itemBasic.Name; @@ -101,7 +119,7 @@ public class ProductReceiptRequestAppService : } var location = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false); - + CheckLocation(location, detail.LocationCode); if (location != null) { detail.LocationErpCode = location.ErpLocationCode; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs index ec4cb26e1..fa3bcbfa7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs @@ -124,6 +124,14 @@ public class ProductRecycleRequestAppService : } #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) @@ -150,7 +158,7 @@ public class ProductRecycleRequestAppService : ProductRecycleRequestDetail detail) { var item = await ItemBasicAclService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); - + CheckItemBasic(item, detail.ItemCode); if (item != null) { detail.ItemName = item.Name; @@ -161,7 +169,7 @@ public class ProductRecycleRequestAppService : } var location = await LocationAclService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false); - + CheckLocation(location, detail.LocationCode); if (location != null) { detail.LocationErpCode = location.ErpLocationCode; @@ -171,7 +179,7 @@ public class ProductRecycleRequestAppService : } var rawLocation = await LocationAclService.GetByCodeAsync(detail.RawLocationCode).ConfigureAwait(false); - + CheckLocation(rawLocation, detail.RawLocationCode); if (rawLocation != null) { detail.RawLocationErpCode = rawLocation.ErpLocationCode; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs index d23d8c20f..63091e918 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs @@ -108,6 +108,8 @@ public class ScrapRequestAppService : SfsStoreRequestAppServiceBase { var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Scrap, subType) .ConfigureAwait(false); + Check.NotNull(tranType, "事务类型", "事务类型不存在"); + entity.Worker = CurrentUser.GetUserName(); entity.AutoCompleteJob = tranType.AutoCompleteJob; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferRequests/TransferRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferRequests/TransferRequestAppService.cs index 2b99b9ce4..950a6768b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferRequests/TransferRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferRequests/TransferRequestAppService.cs @@ -166,6 +166,7 @@ public class TransferRequestAppService : SfsStoreRequestAppServiceBase { var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.Transfer, subType) .ConfigureAwait(false); + Check.NotNull(tranType, "事务类型", "事务类型不存在"); entity.Worker = CurrentUser.GetUserName(); entity.AutoCompleteJob = tranType.AutoCompleteJob; 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 77e876b6f..a91aa54e3 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,6 +59,24 @@ 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 赋值 /// @@ -69,7 +87,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA private async Task SetDetailPropertiesAsync(UnplannedIssueRequestDetail detail) { var itemBasic = await ItemBasicAclService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); - + CheckItemBasic(itemBasic, detail.ItemCode); if (itemBasic != null) { detail.ItemCode = itemBasic.Code; @@ -82,7 +100,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA } var location = await LocationAclService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false); - + CheckLocation(location, detail.LocationCode); if (location != null) { detail.WarehouseCode = location.WarehouseCode; 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 b4e3d4656..e96472a85 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,6 +55,24 @@ 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 赋值 /// @@ -65,7 +83,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ private async Task SetDetailPropertiesAsync(UnplannedReceiptRequestDetail detail) { var itemBasic = await ItemBasicAclService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); - + CheckItemBasic(itemBasic, detail.ItemCode); if (itemBasic != null) { detail.ItemName = itemBasic.Name; @@ -76,7 +94,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ } var location = await LocationAclService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false); - + CheckLocation(location, detail.LocationCode); if (location != null) { detail.LocationErpCode = location.ErpLocationCode;