From 9ec043dadfc8c50b304685e1102e93ed7454189b Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Tue, 25 Apr 2023 09:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductReceiptNoteManager.cs              |  2 +-
 .../PurchaseOrders/PurchaseOrderManager.cs    |  1 -
 .../Transactions/BackFlushNoteEventHandler.cs |  1 +
 .../ProductReceiptNoteEventHandler.cs         | 31 +++++++++++++++++--
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductReceiptNotes/ProductReceiptNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductReceiptNotes/ProductReceiptNoteManager.cs
index 5b6caa107..855f7519d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductReceiptNotes/ProductReceiptNoteManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductReceiptNotes/ProductReceiptNoteManager.cs
@@ -42,7 +42,7 @@ public class ProductReceiptNoteManager : SfsStoreManagerBase<ProductReceiptNote,
     public override async Task<ProductReceiptNote> CreateAsync(ProductReceiptNote productReceiptNote)
     {
 
-        if (string.IsNullOrEmpty(productReceiptNote.ProductionPlanNumber) == false)
+         if (string.IsNullOrEmpty(productReceiptNote.ProductionPlanNumber) == false)
         {
             //更新生产计划
             var productionPlan = await _productionPlanRepository.FindAsync(c => c.Number == productReceiptNote.ProductionPlanNumber, true).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs
index 721b1c17c..965a025b8 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs
@@ -54,7 +54,6 @@ public class PurchaseOrderManager : SfsStoreManagerBase<PurchaseOrder, PurchaseO
         purchaseOrder.SetIdAndNumberWithDetails(GuidGenerator, purchaseOrder.Number);
         //await PublishCreatedAsync(purchaseOrder).ConfigureAwait(false);
         //不要用base.create 要不会把number覆盖
-        await PublishCreatedAsync(purchaseOrder).ConfigureAwait(false);
         return await Repository.InsertAsync(purchaseOrder).ConfigureAwait(false);
     }
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs
index 00d45ab6a..23cbdad5f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs
@@ -73,6 +73,7 @@ public class BackFlushNoteEventHandler
             transaction.LocationCode=detail.LocationCode;
             transaction.LocationErpCode=detail.LocationErpCode;
             transaction.WarehouseCode=detail.WarehouseCode;
+            transaction.Status = EnumInventoryStatus.OK;
 
             transactions.Add(transaction);
         }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs
index 1fb69bf5e..8646730cf 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.EventBus;
 using Volo.Abp.Uow;
+using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
@@ -17,6 +19,14 @@ public class ProductReceiptNoteEventHandler
 {
     private const EnumTransInOut TransInOut = EnumTransInOut.In;
     private const EnumTransType TransType = EnumTransType.ProductReceipt;
+    private readonly IItemBasicAppService _itemBasicAppService;
+    private readonly ILocationAppService _locationAppService;
+
+    public ProductReceiptNoteEventHandler(IItemBasicAppService itemBasicAppService, ILocationAppService locationAppService)
+    {
+        _itemBasicAppService = itemBasicAppService;
+        _locationAppService = locationAppService;
+    }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<ProductReceiptNote> eventData)
@@ -30,7 +40,7 @@ public class ProductReceiptNoteEventHandler
     {
         var inboundTransactions = new List<TransactionEditInput>();
 
-        inboundTransactions.AddRange(BuildTransactions(productReceiptNote));
+        inboundTransactions.AddRange(await BuildTransactions(productReceiptNote));
 
         await TransactionAppService.AddManyAsync(inboundTransactions).ConfigureAwait(false);
 
@@ -51,13 +61,13 @@ public class ProductReceiptNoteEventHandler
         //如果要做库存事务汇总，可以修改此处
         foreach (var productReceiptNote in productReceiptNotes)
         {
-            inboundTransactions.AddRange(BuildTransactions(productReceiptNote));
+            inboundTransactions.AddRange(await BuildTransactions(productReceiptNote));
         }
 
         await TransactionAppService.AddManyAsync(inboundTransactions).ConfigureAwait(false);
     }
 
-    private List<TransactionEditInput> BuildTransactions(ProductReceiptNote productReceiptNote)
+    private async Task<List<TransactionEditInput>> BuildTransactions(ProductReceiptNote productReceiptNote)
     {
         var transactionCreateInputs = new List<TransactionEditInput>();
         //构造库存入库创建Input
@@ -65,6 +75,21 @@ public class ProductReceiptNoteEventHandler
         {
             var transaction = ObjectMapper.Map<ProductReceiptNoteDetail, TransactionEditInput>(detail);
 
+            var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
+                ;
+            detail.ItemDesc1 = itemBasicDto.Desc1;
+            detail.ItemDesc2 = itemBasicDto.Desc2;
+            detail.ItemName=itemBasicDto.Name;
+            detail.StdPackQty=itemBasicDto.StdPackQty;
+
+            var erpLocationDtos= await _locationAppService.GetListByTypesAndErpCodeAsync(new List<EnumLocationType> { EnumLocationType.WIP },
+                detail.LocationErpCode).ConfigureAwait(false);
+            var erpLocationDto = erpLocationDtos.First();
+            detail.LocationArea = erpLocationDto.Code;
+            detail.LocationGroup = erpLocationDto.LocationGroupCode;
+            detail.LocationErpCode= erpLocationDto.Code;
+            detail.LocationCode= erpLocationDto.Code;
+
             transaction.TransType = TransType;
             transaction.TransInOut = TransInOut;
             transaction.WarehouseCode = productReceiptNote.WarehouseCode;