From eff41fa8027b44e71616af7bc0751dc124c1ddf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B8=A4=E6=97=AD=5BIrelia=5D?= <366601522@qq.com>
Date: Sat, 19 Aug 2023 16:18:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=BAmes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs | 1 +
 1 file changed, 1 insertion(+)

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 dcd78cc32..3014ccf0e 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
@@ -176,6 +176,7 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase
         if (!string.IsNullOrEmpty(apiUrl))
         {
             var productReceiptJson = JsonSerializer.Deserialize<ProductReceiptNoteEditInput>(incomingToWms.DataContent);
+            productReceiptJson.Worker = "Mes";
             try
             {
 

From 7f55b9677ba735ba876d05b28df2a44e0f680274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B8=A4=E6=97=AD=5BIrelia=5D?= <366601522@qq.com>
Date: Sat, 19 Aug 2023 17:39:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Plans/SupplierAsns/SupplierAsnManager.cs               | 1 +
 .../Transactions/PurchaseReceiptNoteEventHandler.cs        | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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<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);
         }
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;
 
     /// <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)
             {

From f476553e74dafd14e0207d1dbd7b226ae6cc21f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B8=A4=E6=97=AD=5BIrelia=5D?= <366601522@qq.com>
Date: Sat, 19 Aug 2023 18:42:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=93=8D=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Jobs/PurchaseReceiptJobEventHandler.cs                   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/PurchaseReceiptJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/PurchaseReceiptJobEventHandler.cs
index 09821b5db..b3326c416 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/PurchaseReceiptJobEventHandler.cs
+++ b/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)