From 4b71cad8c984c04c275cc0cdc5d5a9754c219e34 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 15 Nov 2023 14:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=93=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lannedIssueRequestForDongyangAppService.cs | 51 +++++++++++++++---- ...nnedReceiptRequestForDongyangAppService.cs | 33 ++++++++++++ 2 files changed, 75 insertions(+), 9 deletions(-) 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 137415276..47c6694eb 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 @@ -70,6 +70,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA { var itemBasic = await ItemBasicAclService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); CheckItemBasic(itemBasic, detail.ItemCode); + await CheckOnceBusiCodeAsync(detail).ConfigureAwait(false); if (itemBasic != null) { detail.ItemCode = itemBasic.Code; @@ -164,19 +165,19 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA /// private async Task SetEntityPropertiesAsync(UnplannedIssueRequest entity) { - var userName = CurrentUser.GetUserName(); + //var userName = CurrentUser.GetUserName(); - var department = await _departmentAppService.GetByUsernameAsync(userName).ConfigureAwait(false); + //var department = await _departmentAppService.GetByUsernameAsync(userName).ConfigureAwait(false); - if (department != null) - { - entity.DeptCode = department.Code; - entity.DeptName = department.Name; - } + //if (department != null) + //{ + // entity.DeptCode = department.Code; + // entity.DeptName = department.Name; + //} - entity.Worker = userName; + //entity.Worker = userName; - entity.BuildDate = DateTime.Now; + //entity.BuildDate = DateTime.Now; await SetRequestAutoPropertiesAsync(entity).ConfigureAwait(false); } @@ -332,6 +333,38 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA } } + protected async Task CheckOnceBusiCodeAsync(UnplannedIssueRequestDetail detail) + { + if (!string.IsNullOrEmpty(detail.CaseCode)) + { + var dict = await DictAclService.GetByCodeAsync(nameof(detail.CaseCode)).ConfigureAwait(false); + + if (dict == null) + { + throw new UserFriendlyException($"专案{detail.CaseCode}不存在"); + } + else + { + if (dict.Items != null && dict.Items.Count > 0) + { + var item = dict.Items.FirstOrDefault(t => t.Code == detail.CaseCode); + if (item == null) + { + throw new UserFriendlyException($"专案{detail.CaseCode}不存在"); + } + } + else + { + throw new UserFriendlyException($"专案{detail.CaseCode}不存在"); + } + } + } + else + { + throw new UserFriendlyException(($"专案不能为空")); + } + } + protected async Task CheckProjCapacityCodeAsync(UnplannedIssueRequestImportInput importInput, List validationRresult) { var dict = await DictAclService.GetByCodeAsync(nameof(importInput.ProjCapacityCode)).ConfigureAwait(false); 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 5edae692f..60c680332 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 @@ -66,6 +66,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ { var itemBasic = await ItemBasicAclService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); CheckItemBasic(itemBasic, detail.ItemCode); + CheckOnceBusiCodeAsync(detail); if (itemBasic != null) { detail.ItemName = itemBasic.Name; @@ -347,5 +348,37 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ return transactionType; } + protected async Task CheckOnceBusiCodeAsync(UnplannedReceiptRequestDetail detail) + { + if (!string.IsNullOrEmpty(detail.CaseCode)) + { + var dict = await DictAclService.GetByCodeAsync(nameof(detail.CaseCode)).ConfigureAwait(false); + + if (dict == null) + { + throw new UserFriendlyException($"专案{detail.CaseCode}不存在"); + } + else + { + if (dict.Items != null && dict.Items.Count > 0) + { + var item = dict.Items.FirstOrDefault(t => t.Code == detail.CaseCode); + if (item == null) + { + throw new UserFriendlyException($"专案{detail.CaseCode}不存在"); + } + } + else + { + throw new UserFriendlyException($"专案{detail.CaseCode}不存在"); + } + } + } + else + { + throw new UserFriendlyException(($"专案不能为空")); + } + } + #endregion }