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-09-10 17:42:47 +08:00
parent ddae9f34d7
commit fc57a19cf8
20 changed files with 410 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,10 +290,12 @@ namespace Tnb.WarehouseMgr
if (flag)
{
await _wareHouseService.SsxControl(dis, "UNLOAD");
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode} 确认成功");
return await ToApiResult(HttpStatusCode.OK, "成功");
}
else
{
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode} 确认信号不允许");
return await ToApiResult(HttpStatusCode.InternalServerError, "失败");
}
}
@@ -304,10 +306,12 @@ namespace Tnb.WarehouseMgr
{
// 二楼机械臂
await _wareHouseService.Floor2MechanicalConfirm(dis, "UNLOAD");
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode} 确认成功");
return await ToApiResult(HttpStatusCode.OK, "成功");
}
else
{
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode} 确认成功");
return await ToApiResult(HttpStatusCode.OK, "成功");
}
}
@@ -316,6 +320,7 @@ namespace Tnb.WarehouseMgr
{
Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace);
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode} 确认失败");
return await ToApiResult(HttpStatusCode.InternalServerError, $"放货确认..................失败 原因是{ex.Message}");
throw;
}
@@ -915,7 +920,7 @@ namespace Tnb.WarehouseMgr
};
Logger.Information($"taskCompleUpInput json parameter:{JsonConvert.SerializeObject(taskCompleUpInput)}");
await _wareHouseService.TaskComplate(taskCompleUpInput);
await _wareHouseService.SsxControl(disTask, "UNLOAD");
await _wareHouseService.SsxControl_complete(disTask, "UNLOAD");
await _wareHouseService.Floor2MechanicalComplete(disTask, "UNLOAD");
@@ -960,6 +965,13 @@ namespace Tnb.WarehouseMgr
})
.Where(it => it.elevator_id == wmsElevatorH.elevator_id).ExecuteCommandAsync();
var floor3FirstSelectElevator = await _db.Queryable<BasFactoryConfig>().Where(p => p.key == "floor3FirstSelectElevator").FirstAsync();
if (floor3FirstSelectElevator.value == input.elevator_code)
{
// 剩余可放托数
await _db.Updateable<BasFactoryConfig>().SetColumns(r => r.value == "2")
.Where(r => r.key == "floor3FirstSelectElevatorTasknums").ExecuteCommandAsync();
}
List<WmsDistaskH> elevatorTasks = _db.Queryable<WmsDistaskH>()
.Where(r => r.startlocation_code.Contains($"DT") && r.endlocation_code.Contains($"DT") && r.act_start_date == null && r.act_end_date == null