ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消任务回调 取消任务 更新货架信息

Browse Source
This commit is contained in:
hehaibing-1996
2025-03-05 11:35:03 +08:00
parent 976f883642
commit a3a9b9c838
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
WCS.BLL/Manager/AGVManager.cs
View File

@ -68,7 +68,8 @@ namespace WCS.BLL.Manager
{ {
var shelf = DbHelp.db.Queryable<ShelfInfo>() var shelf = DbHelp.db.Queryable<ShelfInfo>()
.Where(t => t.ShelfCode == tasks[i].ShelfCode) .Where(t => t.ShelfCode == tasks[i].ShelfCode)
.Where(t => t.CurrentLocationId == tasks[i].StratLocationId && t.DestinationLocationId == tasks[i].EndLocationId) .Where(t => t.CurrentTaskCode == tasks[i].TaskCode)
.Where(t => t.DestinationLocationId == tasks[i].EndLocationId)
.First(); .First();
if (shelf != null) if (shelf != null)
{ {

14
WCS.WebApi/Controllers/AgvCallbackServiceController.cs
View File

@ -89,6 +89,20 @@ namespace WCS.WebApi.Controllers
DbHelp.db.Updateable(shelf).ExecuteCommand(); DbHelp.db.Updateable(shelf).ExecuteCommand();
} }
if (shelf != null && request.method == "cancel" && shelf.TransStatus == TransStatusEnum.运输中)
{
//shelf.CurrentLocationId = 0;
//shelf.CurrentLocaiotnCode = string.Empty;
shelf.DestinationLocationId = 0;
shelf.DestinationLocaiotnCode = string.Empty;
shelf.TransStatus = TransStatusEnum.静止;
shelf.CurrentTaskCode = string.Empty;
DbHelp.db.Updateable(shelf).ExecuteCommand();
}
if (shelf != null && request.method == "end" && shelf.TransStatus == TransStatusEnum.运输中) if (shelf != null && request.method == "end" && shelf.TransStatus == TransStatusEnum.运输中)
{ {
task.TaskStatus = TaskStatusEnum.已结束; task.TaskStatus = TaskStatusEnum.已结束;