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

修改分拣出库相关代码

Browse Source
This commit is contained in:
FanLian
2023-07-28 13:40:20 +08:00
parent ec0697d5f8
commit a78186d7b0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,7 +562,7 @@ namespace Tnb.WarehouseMgr
if (curEleDs?.Count > 0) if (curEleDs?.Count > 0)
{ {
//当前电梯 //当前电梯
var curEle = await _db.Queryable<WmsElevatorH>().SingleAsync(it => it.id == curEleDs.First().bill_id && it.status == 1) ?? throw new AppFriendlyException("电梯被禁用", 500); var curEle = await _db.Queryable<WmsElevatorH>().SingleAsync(it => it.id == curEleDs.First().bill_id && it.status == 1) ?? throw new AppFriendlyException("电梯被禁用或未配置", 500);
//同电梯组电梯 //同电梯组电梯
var sGpEle = await _db.Queryable<WmsElevatorH>().Where(it => it.elevator_group == curEle.elevator_group && it.id != curEle.id && it.status == 1).ToListAsync(); var sGpEle = await _db.Queryable<WmsElevatorH>().Where(it => it.elevator_group == curEle.elevator_group && it.id != curEle.id && it.status == 1).ToListAsync();
//判断电梯组中各电梯任务数 //判断电梯组中各电梯任务数

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

@@ -110,8 +110,8 @@ namespace Tnb.WarehouseMgr
if (carryCodesPart?.Count > 0) if (carryCodesPart?.Count > 0)
{ {
carryCodes.AddRange(carryCodesPart);
var codeQty = carryCodes.Sum(x => x.codeqty); var codeQty = carryCodesPart.Sum(x => x.codeqty);
if (codeQty < os.pr_qty) if (codeQty < os.pr_qty)
{ {
throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500); throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
@@ -132,6 +132,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++)
{ {
@@ -655,6 +656,7 @@ namespace Tnb.WarehouseMgr
osd.qty += dic[osd.id].Sum(d => d); osd.qty += dic[osd.id].Sum(d => d);
if (osd.qty >= osd.pr_qty) if (osd.qty >= osd.pr_qty)
{ {
osd.qty = osd.pr_qty;
osd.line_status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; osd.line_status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
} }
else else
@@ -704,9 +706,8 @@ namespace Tnb.WarehouseMgr
await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).ExecuteCommandAsync(); await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).ExecuteCommandAsync();
} }
} }
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync(); var row = await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync();
await _db.Deleteable<WmsCarryMat>().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync(); await _db.Deleteable<WmsCarryMat>().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync();
} }
if (delBarcodes.Count > 0) if (delBarcodes.Count > 0)
{ {