Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

2023-08-01 10:49:36 +08:00
parent d6c33d91c1 de2ad9b2d0
commit 8b581ab757
2 changed files with 3 additions and 4 deletions
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -378,9 +378,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)
                            {
@@ -402,6 +400,7 @@ namespace Tnb.WarehouseMgr
                                    break;
                                }
                            }
+                            carryCodes.AddRange(curCarryCodes);
                            var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
                            for (int i = 0; i < partCarryMats.Count; i++)
                            {