From 5e6e01a99a3451fa2d4926d5894967db2b388546 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Mon, 31 Jul 2023 17:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E9=BD=90=E5=A5=97?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E3=80=81=E9=BD=90=E5=A5=97=E5=88=86=E6=8B=A3?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs     | 2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs   | 5 ++---
 WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs | 3 ---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 3141cf85..c0bef6f3 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -257,11 +257,11 @@ namespace Tnb.WarehouseMgr
                         {
                             items.ForEach(x => x.is_chain = 1);
                             var itemsCount = items.Count;
-                            var mod = items.Count % moveNum > 0 ? itemsCount / moveNum + 1 : itemsCount / moveNum;
                             var start = 0;
                             var end = Math.Min(itemsCount, moveNum);
                             var arrary = items.ToArray();
                             var dic = new Dictionary<int, WmsDistaskH[]>();
+                            var mod = itemsCount % moveNum > 0 ? itemsCount / moveNum + 1 : itemsCount / moveNum;
                             for (int i = 1; i <= mod; i++)
                             {
                                 while (start < itemsCount)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index 34f54a96..7783ee22 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -373,9 +373,7 @@ namespace Tnb.WarehouseMgr
                                                   .Select<WmsCarryCode>()
                                                   .ToListAsync();
                         if (carryCodesPart?.Count > 0)
-                        {
-
-                            carryCodes.AddRange(carryCodesPart);
+                        {                            
                             var codeQty = carryCodes.Sum(x => x.codeqty);
                             if (codeQty < os.pr_qty)
                             {
@@ -397,6 +395,7 @@ namespace Tnb.WarehouseMgr
                                     break;
                                 }
                             }
+                            carryCodes.AddRange(curCarryCodes);
                             var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
                             for (int i = 0; i < partCarryMats.Count; i++)
                             {
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
index 671d6354..15053ce8 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
@@ -66,9 +66,6 @@ namespace Tnb.WarehouseMgr
             {
                 await _db.Ado.BeginTranAsync();
 
-
-
-
                 if (setSortings?.Count > 0 && !onFlag)
                 {
                     var singleSorting = setSortings[0];