From 069e6d285b9bb846f3226b8fc8caa6ddaab3d1ba Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Tue, 20 Jun 2023 17:34:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PutawayNotes/PutawayNoteAppService.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs index f37e3a111..b7c51fa86 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs @@ -51,15 +51,23 @@ public class PutawayNoteAppService : { foreach (var detail in input.Details) { - var purchasereDetail =await _purchaseReceiptNoteAppService.GetDetailByItemAndPackingAsync(detail.ItemCode, detail.ToPackingCode).ConfigureAwait(false); - if (purchasereDetail != null) + try { - var inspectJobDto =await _inspectJobAppService.GetInspectNoteDetailByPackingCodeAsync(detail.ToPackingCode).ConfigureAwait(false); - if (inspectJobDto.JobStatus != EnumJobStatus.Done) + var purchasereDetail = await _purchaseReceiptNoteAppService + .GetDetailByItemAndPackingAsync(detail.ItemCode, detail.ToPackingCode).ConfigureAwait(false); + if (purchasereDetail != null) { - throw new UserFriendlyException($"包含【{detail.ToPackingCode}】箱码的报检单,尚未完成质检"); + var inspectJobDto = await _inspectJobAppService + .GetInspectNoteDetailByPackingCodeAsync(detail.ToPackingCode).ConfigureAwait(false); + if (inspectJobDto.JobStatus != EnumJobStatus.Done) + { + throw new UserFriendlyException($"包含【{detail.ToPackingCode}】箱码的报检单,尚未完成质检"); + } } } + catch (Exception ex) + { + } } var entity = ObjectMapper.Map(input); From 6b0702c8b0862327dffb7c3c6d87f4b1135d2498 Mon Sep 17 00:00:00 2001 From: mahao Date: Mon, 26 Jun 2023 13:06:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=AE=B1=E7=A0=81=20=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Notes/CountNotes/Inputs/CountNoteImportInput.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs index f785c718e..cf5f21635 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs @@ -37,7 +37,6 @@ public class CountNoteImportInput : SfsStoreImportInputBase /// 箱码 /// [Display(Name = "箱码")] - [Required(ErrorMessage = "{0}是必填项", AllowEmptyStrings = true)] public string PackingCode { get; set; } /// @@ -57,7 +56,6 @@ public class CountNoteImportInput : SfsStoreImportInputBase /// 批次 /// [Display(Name = "批次")] - [Required(ErrorMessage = "{0}是必填项", AllowEmptyStrings = true)] public string Lot { get; set; } /// From e7e28d1ff5b7fd4b703014791d1a6f1969aa6a34 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Mon, 26 Jun 2023 17:30:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Notes/CountNotes/CountNoteAppService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs index 828b6c6ee..042e52d93 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs @@ -115,7 +115,7 @@ public class CountNoteAppService : { if (itemcBasicDto == null) { - throw new UserFriendlyException($"物品代码为【{detail.LocationCode}】不存在"); + throw new UserFriendlyException($"物品代码为【{detail.ItemCode}】不存在"); } }