From 0e4b065a0915c5259cdf58ea93b4da7a47df0f4d Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 5 Jul 2024 11:18:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=97=B6=E5=80=99=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=B4=A8=E6=A3=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/EosIncomingBackgroundWorker.cs | 14 +++++++------- .../Notes/PutawayNotes/PutawayNoteAppService.cs | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs index 159dad81a..3835ef772 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs @@ -51,13 +51,13 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //转换Ship await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"读取 产品"); - //var productHandleService = workerContext.ServiceProvider.GetRequiredService(); - //var productConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保持Product - //var productsFromExternalList = await productHandleService.ReadAsync().ConfigureAwait(false); - //// 转换Product - //await productConverter.ConvertAsync(productsFromExternalList).ConfigureAwait(false); + Logger.LogInformation($"读取 产品"); + var productHandleService = workerContext.ServiceProvider.GetRequiredService(); + var productConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保持Product + var productsFromExternalList = await productHandleService.ReadAsync().ConfigureAwait(false); + // 转换Product + await productConverter.ConvertAsync(productsFromExternalList).ConfigureAwait(false); Logger.LogInformation($"Completed: Handling {Incoming}"); } 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 e02b12a82..ff3e8c52e 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 @@ -127,7 +127,8 @@ public class PutawayNoteAppService : { var inspectJobDto = await _inspectJobAppService .GetInspectNoteDetailByPackingCodeAsync(detail.ToPackingCode).ConfigureAwait(false); - if (inspectJobDto.JobStatus != EnumJobStatus.Done) + var sumitem= inspectJobDto.SummaryDetails.FirstOrDefault(r => r.ItemCode == purchasereDetail.ItemCode); + if (sumitem.SummaryInspectStatus != EnumSummaryInspectStatus.OverInspect) { throw new UserFriendlyException($"包含【{detail.ToPackingCode}】箱码的报检单,尚未完成质检"); }