diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index a3e9b1b2f..f4962a014 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -504,12 +504,12 @@ public class SparePartIssueJobAppService var loctionDto = await _locationAppService.GetByCodeAsync(jobDetailInputdetail.RecommendFromLocationCode) .ConfigureAwait(false); - if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) - { - input.JobStatus = EnumJobStatus.Wait; - } - else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) - { + //if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) + //{ + // input.JobStatus = EnumJobStatus.Wait; + //} + //else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) + //{ jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate; jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode; jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate; @@ -537,7 +537,7 @@ public class SparePartIssueJobAppService jobDetailInputdetail.TransferLibToLocationCode = jobDetailInputdetail.TransferLibFromLocationCode; jobDetailInputdetail.TransferLibToLocationErpCode = jobDetailInputdetail.TransferLibFromLocationErpCode; jobDetailInputdetail.TransferLibToLocationGroup = jobDetailInputdetail.TransferLibFromLocationGroup; - } + //} } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs index 68a317fcd..eaae9b4c0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReturnRequests/PurchaseReturnRequestManager.cs @@ -24,7 +24,9 @@ public class PurchaseReturnRequestManager : SfsStoreRequestManagerBase itm.PoNumber == entity.PoNumber && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false); + var lst = await Repository.GetPagedListAsync(itm => itm.PoNumber == entity.PoNumber + && (itm.RequestStatus != EnumRequestStatus.Refused && itm.RequestStatus != EnumRequestStatus.Cancelled && itm.RequestStatus != EnumRequestStatus.Abort) + && itm.Details.Any(itm => itm.PackingCode == entity.Details[0].PackingCode), 0, 1, null).ConfigureAwait(false); if (lst.Count > 0) { throw new UserFriendlyException($"采购退货申请的订单号{entity.PoNumber}、箱码{entity.Details[0].PackingCode}重复"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs index 5a3086456..55dce1dec 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs @@ -150,6 +150,8 @@ public class SparePartIssueJobEventHandler : if (locationDto.Type == EnumLocationType.RAW) { + break; + //备品不需要做 高转低库移 if (!await IsMinRowAsync(sparePartIssueJob).ConfigureAwait(false)) { var input = new TransferLibRequestEditInput(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs index c15356f76..e402fb2b5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InventoryInitialNoteEventHandler.cs @@ -67,6 +67,11 @@ public class InventoryInitialNoteEventHandler //构造库存转移记录创建Input foreach (var detail in inventoryInitialNote.Details) { + if(string.IsNullOrEmpty(detail.Lot)) + { + detail.Lot = ""; + } + var transaction = ObjectMapper.Map(detail); transaction.TransType = TransType;