diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs index d226dba96..8935f9251 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs @@ -223,6 +223,7 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase if (!string.IsNullOrEmpty(_options.Value.IncomingOptions.apiUrl)) { var productReceiptJson = JsonSerializer.Deserialize(incomingToWms.DataContent); + productReceiptJson.Worker = "Mes"; try { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/SupplierAsns/SupplierAsnManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/SupplierAsns/SupplierAsnManager.cs index 784fa00cd..a5e095a5e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/SupplierAsns/SupplierAsnManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/SupplierAsns/SupplierAsnManager.cs @@ -29,6 +29,7 @@ public class SupplierAsnManager : SfsStoreManagerBase(purchaseReceiptJob); + if (string.IsNullOrEmpty(createInput.Worker)) + { + createInput.Worker = purchaseReceiptJob.Worker; + } + //未收货记录 var noReceiptNoteList = createInput.Details.Where(p => p.Qty == 0); foreach (var detailInput in noReceiptNoteList) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs index 4bf33466c..c0cdb0ae5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs @@ -31,6 +31,7 @@ public class PurchaseReceiptNoteEventHandler private readonly IItemQualityAppService _itemQualityAppService; private readonly ISupplierAsnAppService _supplierAsnAppService; private readonly IPurchaseReceiptRequestAppService _purchaseReceiptRequestAppService; + private readonly IItemBasicAppService _itemBasicAppService; /// /// 收货记录 @@ -43,13 +44,15 @@ public class PurchaseReceiptNoteEventHandler IPurchaseOrderAppService purchaseOrderAppService, IItemQualityAppService itemQualityAppService, ISupplierAsnAppService supplierAsnAppService, - IPurchaseReceiptRequestAppService purchaseReceiptRequestAppService) + IPurchaseReceiptRequestAppService purchaseReceiptRequestAppService, + IItemBasicAppService itemBasicAppService) { _inspectRequestAppService = inspectRequestAppService; _purchaseOrderAppService = purchaseOrderAppService; _itemQualityAppService = itemQualityAppService; _supplierAsnAppService = supplierAsnAppService; _purchaseReceiptRequestAppService = purchaseReceiptRequestAppService; + _itemBasicAppService = itemBasicAppService; } /// @@ -181,6 +184,8 @@ public class PurchaseReceiptNoteEventHandler transaction.Worker = purchaseReceiptNote.Worker; transaction.DocNumber = purchaseReceiptNote.Number; transaction.JobNumber = purchaseReceiptNote.JobNumber; + var itemBasicDto=await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); + transaction.ExpireDate = detail.ProduceDate.AddDays(itemBasicDto.GetValidateDays()); switch (detail.PurchaseReceiptInspectStatus) {