From db8189a6bcc30bb82fbbfe2c512e0a1f287e460d Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Mon, 24 Apr 2023 09:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IncomingToWmsExtensions.cs | 1 + .../BackFlushNotes/BackFlushNoteAppService.cs | 1 - .../ItemTransformRequestAppService.cs | 9 ++++---- .../MaterialRequestManager.cs | 21 ++++++++++++------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs index bc9666215..ff543a74f 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs @@ -157,6 +157,7 @@ public static class IncomingToWmsExtensions var backFlush = JsonSerializer.Deserialize(incomingConverted.DataContent); var balanceAppService = workerContext.ServiceProvider.GetRequiredService(); + var balanceDtos = await balanceAppService.GetRecommendBalancesAsync(new RecommendBalanceRequestInput() { Qty = backFlush.Qty, diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs index ff86c9f94..90f9f8fd1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs @@ -43,5 +43,4 @@ public class BackFlushNoteAppService : return ObjectMapper.Map, List>(entities); } - } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs index ec2059cc0..c2e79752c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs @@ -79,6 +79,7 @@ public class ItemTransformRequestAppService : var toItemBasicDto = await ItemBasicAclService.GetByCodeAsync(detail.ToItemCode).ConfigureAwait(false); var balanceDto= await _balanceAppService.GetByItemLocationAndPackingAsync(detail.FromPackingCode, detail.ItemCode, detail.FromLocationCode).ConfigureAwait(false); + var inventoryLabelDto= await _inventoryLabelAppService.GetByCodeAsync(detail.ToPackingCode).ConfigureAwait(false); detail.FromLocationArea = fromLocationDto.AreaCode; detail.FromLocationErpCode = fromLocationDto.ErpLocationCode; @@ -90,7 +91,7 @@ public class ItemTransformRequestAppService : detail.FromStatus = balanceDto.Status; detail.ToSupplierBatch = string.Empty; - detail.ToLot = balanceDto.Lot; + detail.ToLot = inventoryLabelDto.Lot; detail.ToStatus = balanceDto.Status; detail.ToLocationArea = toLocationDto.AreaCode; @@ -104,9 +105,9 @@ public class ItemTransformRequestAppService : detail.Uom = fromItemBasicDto.BasicUom; detail.ToItemCode = toItemBasicDto.Code; - detail.ToItemDesc1 = toItemBasicDto.Desc2; - detail.ToItemDesc2 = toItemBasicDto.Name; - detail.ItemName = toItemBasicDto.BasicUom; + detail.ToItemDesc1 = toItemBasicDto.Desc1; + detail.ToItemDesc2 = toItemBasicDto.Desc2; + detail.ToItemName = toItemBasicDto.Name; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs index 9150c5461..5d0666e85 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs @@ -76,14 +76,25 @@ public class MaterialRequestManager private async Task SetMaterialRequestStatus(MaterialRequest materialRequest) { - if (!materialRequest.Details.All(p => p.Status == EnumStatus.Close)) + if (materialRequest.Details.All(p => p.Status == EnumStatus.Close)) + { + materialRequest.RequestStatus = EnumRequestStatus.Completed; + } + else { var issueJobs = await _issueJobRepository.GetListAsync(t => t.MaterialRequestNumber == materialRequest.Number).ConfigureAwait(false); if (issueJobs.Count > 0) { - if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done||t.JobStatus==EnumJobStatus.Closed||t.JobStatus==EnumJobStatus.Cancelled)) + if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done || t.JobStatus == EnumJobStatus.Closed || t.JobStatus == EnumJobStatus.Cancelled)) { - materialRequest.RequestStatus = EnumRequestStatus.Completed; + if (materialRequest.Details.All(p => p.ReceivedQty >= p.Qty)) + { + materialRequest.RequestStatus = EnumRequestStatus.Completed; + } + else + { + materialRequest.RequestStatus = EnumRequestStatus.Partial; + } } else { @@ -95,10 +106,6 @@ public class MaterialRequestManager materialRequest.RequestStatus = EnumRequestStatus.Partial; } } - else - { - materialRequest.RequestStatus = EnumRequestStatus.Completed; - } } public virtual async Task CompleteAsync(string number)