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:
马健
2024-07-29 15:49:52 +08:00
parent 0e09a8187c
commit b1027b6e49
15 changed files with 393 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -477,16 +477,43 @@ namespace Tnb.WarehouseMgr
}
else
{
// 排除电梯任务 其他任务取消时自动解锁终点库位
int unlockRow = await _db.Updateable<BasLocation>().SetColumns(r => r.is_lock == 0).Where(r => r.location_code == wmsDistaskH.endlocation_code).ExecuteCommandAsync();
if (unlockRow > 0)
// 排除电梯任务 其他任务取消时自动解锁起点和终点库位
//int unlockStartRow = await _db.Updateable<BasLocation>().SetColumns(r => r.is_lock == 0).Where(r => r.location_code == wmsDistaskH.startlocation_code).ExecuteCommandAsync();
//if (unlockStartRow > 0)
//{
// Logger.Information($"成功解锁起点库位{wmsDistaskH.startlocation_code}");
//}
//else
//{
// Logger.Information($"未成功解锁起点库位{wmsDistaskH.startlocation_code}");
//}
int unlockEndRow = await _db.Updateable<BasLocation>().SetColumns(r => r.is_lock == 0).Where(r => r.location_code == wmsDistaskH.endlocation_code).ExecuteCommandAsync();
if (unlockEndRow > 0)
{
Logger.Information($"成功解锁库位{wmsDistaskH.endlocation_code}");
Logger.Information($"成功解锁终点库位{wmsDistaskH.endlocation_code}");
}
else
{
Logger.Information($"未成功解锁库位{wmsDistaskH.endlocation_code}");
Logger.Information($"未成功解锁终点库位{wmsDistaskH.endlocation_code}");
}
int unlockCarryRow = await _db.Updateable<WmsCarryH>().SetColumns(r => new WmsCarryH
{
is_lock = 0,
//location_id = wmsDistaskH.startlocation_code.Contains("BGWRKYCL0") ? WmsWareHouseConst.LOCATION_YCLBGWDRK : r.location_id,
//location_code = wmsDistaskH.startlocation_code.Contains("BGWRKYCL0") ? "YCLBGWDRK" : r.location_code
}).Where(r => r.carry_code == wmsDistaskH.carry_code).ExecuteCommandAsync();
if (unlockCarryRow > 0)
{
Logger.Information($"成功解锁载具{wmsDistaskH.carry_code}");
}
else
{
Logger.Information($"未成功解锁载具{wmsDistaskH.carry_code}");
}
}
}
@@ -515,6 +542,58 @@ namespace Tnb.WarehouseMgr
if (row > 0)
{
List<string> wmsDistaskHCodes = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code.Contains(input.taskChainCode)).Select(r => r.pretask_code).ToList();
List<WmsDistaskH> wmsDistaskHs = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code.Contains(input.taskChainCode)).ToList();
foreach (WmsDistaskH wmsDistaskH in wmsDistaskHs)
{
if (wmsDistaskH.startlocation_code.Contains("DT") || wmsDistaskH.endlocation_code.Contains("DT"))
{
//WmsElevatorUnlockInput wmsElevatorUnlockInput = new ();
//wmsElevatorUnlockInput.elevator_id = wmsDistaskH.device_id;
//await WmsElevatorUnlock(wmsElevatorUnlockInput);
//Logger.Information($"WCS取消任务{wmsDistaskH.bill_code}，自动解占用电梯{wmsDistaskH.device_id}");
}
else
{
// 排除电梯任务 其他任务取消时自动解锁起点和终点库位
//int unlockStartRow = await _db.Updateable<BasLocation>().SetColumns(r => r.is_lock == 0).Where(r => r.location_code == wmsDistaskH.startlocation_code).ExecuteCommandAsync();
//if (unlockStartRow > 0)
//{
// Logger.Information($"成功起点解锁库位{wmsDistaskH.startlocation_code}");
//}
//else
//{
// Logger.Information($"未成功解锁起点库位{wmsDistaskH.startlocation_code}");
//}
int unlockEndRow = await _db.Updateable<BasLocation>().SetColumns(r => r.is_lock == 0).Where(r => r.location_code == wmsDistaskH.endlocation_code).ExecuteCommandAsync();
if (unlockEndRow > 0)
{
Logger.Information($"成功终点解锁库位{wmsDistaskH.endlocation_code}");
}
else
{
Logger.Information($"未成功解锁终点库位{wmsDistaskH.endlocation_code}");
}
int unlockCarryRow = await _db.Updateable<WmsCarryH>().SetColumns(r => new WmsCarryH
{
is_lock = 0,
//location_id = wmsDistaskH.startlocation_code.Contains("BGWRKYCL0") ? WmsWareHouseConst.LOCATION_YCLBGWDRK : wmsDistaskH.startlocation_id,
//location_code = wmsDistaskH.startlocation_code.Contains("BGWRKYCL0") ? "YCLBGWDRK" : wmsDistaskH.startlocation_code
}).Where(r => r.carry_code == wmsDistaskH.carry_code).ExecuteCommandAsync();
if (unlockCarryRow > 0)
{
Logger.Information($"成功解锁载具{wmsDistaskH.carry_code}");
}
else
{
Logger.Information($"未成功解锁载具{wmsDistaskH.carry_code}");
}
}
}
await _db.Updateable<WmsPretaskH>().SetColumns(r => new WmsPretaskH
{