From d8bc6132131418d53495509e9a41eb694d283282 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 15 May 2024 14:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=BA=93=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KittingIssueJobAppService.cs | 2 +- .../TransferLibJobAppService.cs | 2 +- .../TransferLibRequestAppService.cs | 2 +- .../TransferLibRequestEventHandler.cs | 13 -------- .../TransferLibNoteEventHandler.cs | 31 +++++++++++-------- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index 6376a2716..d8b66d4d9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -578,7 +578,7 @@ public class KittingIssueJobAppService list=list.Where(p => p.JobNumber != jobNumber).ToList(); if (list.Any()) { - throw new UserFriendlyException($"任务号【{list.First().JobNumber}】已占用,【{packingCode}】箱码"); + throw new UserFriendlyException($"任务号【{list.First().JobNumber}】的任务，已占用【{packingCode}】箱码的库存。"); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs index ea33a207d..372eafae9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs @@ -304,7 +304,7 @@ public class TransferLibJobAppService list = list.Where(p => p.JobNumber != jobNumber).ToList(); if (list.Any()) { - throw new UserFriendlyException($"任务号【{list.First().JobNumber}】已占用,【{packingCode}】箱码"); + throw new UserFriendlyException($"任务号【{list.First().JobNumber}】的任务，已占用【{packingCode}】箱码的库存。"); } } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs index 121bf4934..6cecb9698 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs @@ -358,7 +358,7 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase request.RequestStatus = EnumRequestStatus.Cancelled; await _repository.UpdateAsync(request).ConfigureAwait(false); } - else + else if(request.RequestStatus!=EnumRequestStatus.Cancelled&&request.RequestStatus!=EnumRequestStatus.Completed) { throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消"); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs index 72ea8c7cb..8179741c4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs @@ -89,19 +89,6 @@ public class TransferLibRequestEventHandler await _transferLibJobManager.AddAsync(input).ConfigureAwait(false); } - - switch (enumTransSubType) - { - case EnumTransSubType.Transfer_Inside: - case EnumTransSubType.Transfer_Area: - break; - case EnumTransSubType.Transfer_Warehouse: - case EnumTransSubType.Transfer_Customer: - case EnumTransSubType.Transfer_WIP: - // entity.Handle(); - entity.Complete(); - break; - } } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/TransferLibNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/TransferLibNoteEventHandler.cs index 92b6e6f23..ab99a4e12 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/TransferLibNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/TransferLibNoteEventHandler.cs @@ -228,25 +228,30 @@ public class TransferLibNoteEventHandler { var inputoExpectOutEditInput = new ExpectOutEditInput(); inputoExpectOutEditInput.JobNumber = detail.CallRequestNumber; + inputoExpectOutEditInput.ItemCode = detail.ItemCode; - inputoExpectOutEditInput.Qty = detail.HandledFromQty; - inputoExpectOutEditInput.LocationCode = detail.HandledFromLocationCode; - inputoExpectOutEditInput.ArriveDate = detail.HandledFromArriveDate; - inputoExpectOutEditInput.ContainerCode = detail.HandledFromContainerCode; - inputoExpectOutEditInput.ExpireDate = detail.HandledFromExpireDate; inputoExpectOutEditInput.ItemDesc1 = detail.ItemDesc1; inputoExpectOutEditInput.ItemDesc2 = detail.ItemDesc2; inputoExpectOutEditInput.ItemName = detail.ItemName; - inputoExpectOutEditInput.LocationArea = detail.HandledFromLocationArea; - inputoExpectOutEditInput.LocationGroup = detail.HandledFromLocationGroup; - inputoExpectOutEditInput.LocationErpCode = detail.HandledFromLocationErpCode; - inputoExpectOutEditInput.PackingCode = detail.HandledFromPackingCode; - inputoExpectOutEditInput.Lot = detail.HandledFromLot; - inputoExpectOutEditInput.ProduceDate = detail.HandledFromProduceDate; + + inputoExpectOutEditInput.Qty = detail.HandledToQty; + + inputoExpectOutEditInput.LocationCode = detail.HandledToLocationCode; + inputoExpectOutEditInput.LocationArea = detail.HandledToLocationArea; + inputoExpectOutEditInput.LocationGroup = detail.HandledToLocationGroup; + inputoExpectOutEditInput.LocationErpCode = detail.HandledToLocationErpCode; + + inputoExpectOutEditInput.ArriveDate = detail.HandledToArriveDate; + inputoExpectOutEditInput.ContainerCode = detail.HandledToContainerCode; + inputoExpectOutEditInput.ExpireDate = detail.HandledToExpireDate; + + inputoExpectOutEditInput.PackingCode = detail.HandledToPackingCode; + inputoExpectOutEditInput.Lot = detail.HandledToLot; + inputoExpectOutEditInput.ProduceDate = detail.HandledToProduceDate; inputoExpectOutEditInput.Status = detail.Status; inputoExpectOutEditInput.Uom = detail.Uom; - inputoExpectOutEditInput.SupplierBatch = detail.HandledFromSupplierBatch; - inputoExpectOutEditInput.WarehouseCode = detail.HandledFromWarehouseCode; + inputoExpectOutEditInput.SupplierBatch = detail.HandledToSupplierBatch; + inputoExpectOutEditInput.WarehouseCode = detail.HandledToWarehouseCode; await _expectOutAppService.AddManyAsync(new EditableList { inputoExpectOutEditInput }) .ConfigureAwait(false);