From 48950fb95726c1466669528c47607f8510edfbba Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 23 Nov 2023 15:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8F=8A=E6=97=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/TakeStockService.cs              | 33 ++++---------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs
index 5d59015b..ff7a83d9 100644
--- a/src/WMS.Web.Domain/Services/TakeStockService.cs
+++ b/src/WMS.Web.Domain/Services/TakeStockService.cs
@@ -71,41 +71,20 @@ namespace WMS.Web.Domain.Services
                 entity.StockCode = subStock?.StockCode;
             }
 
-            #region 组装库存dto
-            List<BoxInventoryGenerateDto> inventoryList = new List<BoxInventoryGenerateDto>();
-            foreach (var entity in list)
-            {
-                var inventoryDetail = new List<BoxInventoryGenerateDetailsDto>()
-                {
-                    new BoxInventoryGenerateDetailsDto()
-                    {
-                         MaterialId=entity.MaterialId,
-                          Qty=entity.FinalQty
-                    }
-                };
-                BoxInventoryGenerateDto inventory = new BoxInventoryGenerateDto()
-                {
-                    BoxId = entity.BoxId,
-                    InventoryInOutMethod = 2,//盘点单按产品修改库存
-                    InventoryInOutType = entity.ResultType == TakeStockType.Profit ? 1 : 2,
-                    StockCode = entity.StockCode,
-                    SubStockId = entity.SubStockId,
-                    Details = inventoryDetail
-                };
-                inventoryList.Add(inventory);
-            }
-            #endregion
-
             IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
             Result res_Rollback = Result.ReSuccess();
             bool isSuccess = true;
-            var res_Inventory = await _boxInventoryService.HandlBoxInventory(inventoryList, false);
-            if (!res_Inventory.IsSuccess) res_Rollback = res_Inventory;
+           
             if (res_Rollback.IsSuccess)
             {
                 isSuccess = await _takeStockRepositories.AddRange(list, false);
                 if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
             }
+            if(res_Rollback.IsSuccess)
+            {
+                var res_Inventory = await _boxInventoryService.GenerateTakeBox(list, false);
+                if (!res_Inventory.IsSuccess) res_Rollback = res_Inventory;
+            }
 
             //提交事务
             isSuccess = _transactionRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction);