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

电梯逻辑变更 erp同步调整 生成条码变更等

Browse Source
This commit is contained in:
马健
2024-09-03 15:37:06 +08:00
parent 692e944f23
commit a2f9014c08
17 changed files with 1105 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,10 +415,12 @@ namespace Tnb.WarehouseMgr
}
// 如果还未判定几托下，判断是否放了两托货
elevatorTasks = _db.Queryable<WmsDistaskH>()
.Where(r => r.startlocation_code == $"DT-3-{sno}" && r.endlocation_code == $"DT-1-{sno}" && r.act_start_date == null && r.act_end_date == null
&& r.status != WmsWareHouseConst.TASK_BILL_STATUS_CANCEL_ID && r.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).ToList();
if (elevatorTasks.Count >= 2)
// elevatorTasks = _db.Queryable<WmsDistaskH>()
//.Where(r => r.startlocation_code == $"DT-3-{sno}" && r.endlocation_code == $"DT-1-{sno}" && r.act_start_date == null && r.act_end_date == null
//&& r.status != WmsWareHouseConst.TASK_BILL_STATUS_CANCEL_ID && r.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).ToList();
// 电梯第三次改动
if (elevator.carry_count >= 2)
{
Logger.LogInformation($"电梯内{devName}已有两托货！");
return await ToApiResult(HttpStatusCode.InternalServerError, $"电梯内{devName}已有两托货！");
@@ -946,7 +948,8 @@ namespace Tnb.WarehouseMgr
await _db.Updateable<WmsElevatorH>().SetColumns(r => new WmsElevatorH
{
is_use = (int)EnumElevatorUseStatus.空闲,
use_tasks = ""
use_tasks = "",
carry_count = 0
})
.Where(it => it.elevator_id == wmsElevatorH.elevator_id).ExecuteCommandAsync();