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-16 14:31:34 +08:00
parent 61287c5162 370321611a
commit 93fb031ec3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,6 +517,7 @@ namespace Tnb.WarehouseMgr
carryCodeIts.Add(carryCode); carryCodeIts.Add(carryCode);
BasLocation loc = new(); BasLocation loc = new();
loc.id = multiList[i].endlocation_id;
loc.is_lock = 0; loc.is_lock = 0;
if (multiList[i].carry_status.ToEnum<EnumCarryStatus>() == EnumCarryStatus.空闲) if (multiList[i].carry_status.ToEnum<EnumCarryStatus>() == EnumCarryStatus.空闲)
{ {
@@ -527,13 +528,10 @@ namespace Tnb.WarehouseMgr
} }
await _db.Updateable(carryIts).UpdateColumns(it => new { it.is_lock, it.location_id, it.location_code }).ExecuteCommandAsync(); await _db.Updateable(carryIts).UpdateColumns(it => new { it.is_lock, it.location_id, it.location_code }).ExecuteCommandAsync();
//更新条码的库位和仓库信息 //更新条码的库位和仓库信息
var carryIdItor = multiList.Select(x => x.carry_id); await _db.Updateable(carryCodeIts).UpdateColumns(it => new { it.warehouse_id, it.location_id, it.location_code }).Where(it => multiList.Select(x => x.carry_id).Contains(it.carry_id)).ExecuteCommandAsync();
await _db.Updateable(carryCodeIts).UpdateColumns(it => new { it.warehouse_id, it.location_id, it.location_code }).Where(it => it.carry_id.In(carryIdItor)).ExecuteCommandAsync();
//更新库位信息，使用状态为 使用，锁定状态为未锁定 //更新库位信息，使用状态为 使用，锁定状态为未锁定
var locIdItor = multiList.Select(x => x.endlocation_id); await _db.Updateable(locIts).UpdateColumns(it => new { it.is_use, it.is_lock }).ExecuteCommandAsync();
await _db.Updateable(locIts).UpdateColumns(it => new { it.is_use, it.is_lock }).Where(it => it.id.In(locIdItor)).ExecuteCommandAsync();
//更新业务主表的单据状态 //更新业务主表的单据状态
foreach (var dt in disTasks) foreach (var dt in disTasks)
{ {