From f9ce3ebec96ee285476bb4a5e62f918ebfe9970e Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 3 Apr 2024 10:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/SerialNumberService.cs              | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs
index 1615da51..10a843e4 100644
--- a/src/WMS.Web.Domain/Services/SerialNumberService.cs
+++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs
@@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services
                 };
                 if (moveBoxRecord.Type == MoveBoxType.Up)
                 {
-                    var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode+ moveBoxRecord.StockCode+ moveBoxRecord.OrgCode);
+                    var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode + moveBoxRecord.StockCode + moveBoxRecord.OrgCode);
                     op.Remark += "\r\n" + "仓位:" + srcSubStock;
                 }
                 sList.Add(op);
@@ -180,6 +180,7 @@ namespace WMS.Web.Domain.Services
             var serialNumbers = outStock.Details.SelectMany(s => s.SerialNumbers).ToList();
             var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
             var boxIds = entityList.Select(s => s.BoxId).ToList();
+            boxIds.AddRange(outStock.Details.SelectMany(s => s.BoxsDetails).Select(s => s.BoxId));
             var boxList = await _boxRepositories.GetEntityList(boxIds);
             var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
 
@@ -191,7 +192,8 @@ namespace WMS.Web.Domain.Services
             List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
             foreach (var entity in entityList)
             {
-                var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
+                var boxId = outStock.Details.SelectMany(s => s.BoxsDetails).FirstOrDefault(w => w.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
+                var box = boxList.FirstOrDefault(f => f.Id == boxId);
                 var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
                 if (outstockDetail == null) continue;
                 //修改序列号和箱绑定关系
@@ -202,8 +204,8 @@ namespace WMS.Web.Domain.Services
                 {
                     MaterialNumber = entity.MaterialNumber,
                     SerialNumber = entity.SerialNumber,
-                    OrgId = box.OrgId,
-                    SupplierId = box.SupplierId,
+                    OrgId = box?.OrgId ?? 0,
+                    SupplierId = box?.SupplierId ?? 0,
                     OperateTime = DateTime.Now,
                     OperateType = OutStockTypeConvert(outStock.Type),
                     OperateUser = userName,
@@ -322,7 +324,7 @@ namespace WMS.Web.Domain.Services
                 var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
                 var box = boxList.FirstOrDefault(f => f.Id == boxId);
                 var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
-                var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode+ inStock.StockCode+ inStock.OrgCode);
+                var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode);
                 //修改序列号和箱绑定关系
                 entity.InStock(instockDetail.SourceBillNo, inStock.Type);
                 entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
@@ -411,7 +413,7 @@ namespace WMS.Web.Domain.Services
                 if (backRecord.Type == BackRecordType.OutstockOn)
                 {
                     var subStockId = backRecord?.SubStockCode ?? "";
-                    var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, backRecord?.SubStockCode ?? ""+ backRecord?.StockCode ?? ""+ backRecord?.OrgCode ?? "");
+                    var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, backRecord?.SubStockCode ?? "" + backRecord?.StockCode ?? "" + backRecord?.OrgCode ?? "");
                     op.Remark += "\r\n" + "仓位:" + srcSubStock;
                 }
                 sList.Add(op);
@@ -445,7 +447,7 @@ namespace WMS.Web.Domain.Services
         {
             var serialNumbers = takeStocks.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList();
             var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
-            var boxIds = takeStocks.SelectMany(s=>s.Details).Select(s => s.BoxId).ToList();
+            var boxIds = takeStocks.SelectMany(s => s.Details).Select(s => s.BoxId).ToList();
             var boxList = await _boxRepositories.GetEntityList(boxIds);
 
             List<Box> box_New_List = new List<Box>();