wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
FanLian
2023-08-01 10:49:36 +08:00
parent d6c33d91c1 de2ad9b2d0
commit 8b581ab757
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -257,11 +257,11 @@ namespace Tnb.WarehouseMgr
{ {
items.ForEach(x => x.is_chain = 1); items.ForEach(x => x.is_chain = 1);
var itemsCount = items.Count; var itemsCount = items.Count;
var mod = items.Count % moveNum > 0 ? itemsCount / moveNum + 1 : itemsCount / moveNum;
var start = 0; var start = 0;
var end = Math.Min(itemsCount, moveNum); var end = Math.Min(itemsCount, moveNum);
var arrary = items.ToArray(); var arrary = items.ToArray();
var dic = new Dictionary<int, WmsDistaskH[]>(); var dic = new Dictionary<int, WmsDistaskH[]>();
var mod = itemsCount % moveNum > 0 ? itemsCount / moveNum + 1 : itemsCount / moveNum;
for (int i = 1; i <= mod; i++) for (int i = 1; i <= mod; i++)
{ {
while (start < itemsCount) while (start < itemsCount)

5
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -378,9 +378,7 @@ namespace Tnb.WarehouseMgr
.Select<WmsCarryCode>() .Select<WmsCarryCode>()
.ToListAsync(); .ToListAsync();
if (carryCodesPart?.Count > 0) if (carryCodesPart?.Count > 0)
{ {
carryCodes.AddRange(carryCodesPart);
var codeQty = carryCodes.Sum(x => x.codeqty); var codeQty = carryCodes.Sum(x => x.codeqty);
if (codeQty < os.pr_qty) if (codeQty < os.pr_qty)
{ {
@@ -402,6 +400,7 @@ namespace Tnb.WarehouseMgr
break; break;
} }
} }
carryCodes.AddRange(curCarryCodes);
var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>(); var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
for (int i = 0; i < partCarryMats.Count; i++) for (int i = 0; i < partCarryMats.Count; i++)
{ {