Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

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<ProductReceiptNoteEditInput>(incomingToWms.DataContent);
+            productReceiptJson.Worker = "Mes";
             try
             {
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/SupplierAsns/SupplierAsnManager.cs

@@ -29,6 +29,7 @@ public class SupplierAsnManager : SfsStoreManagerBase<SupplierAsn, SupplierAsnDe
         if (!string.IsNullOrWhiteSpace(entity.Number))//接口过来的数据是有Number的
         {
             entity.SetIdAndNumberWithDetails(GuidGenerator, entity.Number);
+            await SetDetailAsync(entity.Details).ConfigureAwait(false);
             entity = await Repository.InsertAsync(entity).ConfigureAwait(false);
             await PublishCreatedAsync(entity).ConfigureAwait(false);
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/PurchaseReceiptJobEventHandler.cs

@@ -49,6 +49,11 @@ public class PurchaseReceiptJobEventHandler :
         var holdLocation = await LocationAclService.GetFirstByTypeAsync(EnumLocationType.HOLD).ConfigureAwait(false); //隔离库位
         var createInput = ObjectMapper.Map<PurchaseReceiptJob, PurchaseReceiptNoteEditInput>(purchaseReceiptJob);
 
+        if (string.IsNullOrEmpty(createInput.Worker))
+        {
+            createInput.Worker = purchaseReceiptJob.Worker;
+        }
+
         //未收货记录
         var noReceiptNoteList = createInput.Details.Where(p => p.Qty == 0);
         foreach (var detailInput in noReceiptNoteList)

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;
 
     /// <summary>
     ///     收货记录
@@ -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;
     }
 
     /// <summary>
@@ -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)
             {