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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-08-18 17:13:13 +08:00
parent 027331c617 96b5f3ca8c
commit 1b9c2030a6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,7 +353,7 @@ namespace Tnb.WarehouseMgr
taskCode = it.bill_code, taskCode = it.bill_code,
sourceName = it.startpoint_code, sourceName = it.startpoint_code,
targetName = it.endpoint_code, targetName = it.endpoint_code,
carryCode = it.carry_code, containerCode = it.carry_code,
})); }));
Log.Information($"请求地址：{url}"); Log.Information($"请求地址：{url}");
foreach (var (k, v) in taskChainCodeDic) foreach (var (k, v) in taskChainCodeDic)

3
WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
View File

@@ -361,9 +361,10 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
var tasks = new List<Task<Task<int>>>(); var tasks = new List<Task<Task<int>>>();
Func<WmsCarryH, Task<int>>? upateNullCarryFunc = carryIt => Task.Run(() => _db.CopyNew().Updateable(carryIt).ExecuteCommandAsync());
foreach (var carryIt in carrys) foreach (var carryIt in carrys)
{ {
tasks.Add(_carryService.UpdateNullCarry(carryIt, carryIt => Task.Run(() => _db.CopyNew().Updateable(carryIt).ExecuteCommandAsync()))); tasks.Add(_carryService.UpdateNullCarry(carryIt, upateNullCarryFunc));
} }
var all = await Task.WhenAll(tasks.Select(t => t.Unwrap())); var all = await Task.WhenAll(tasks.Select(t => t.Unwrap()));
if (all.All(x => x > 0)) if (all.All(x => x > 0))