From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化
---
WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/RGVJob_BC.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git "a/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/RGVJob_BC.cs" "b/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/RGVJob_BC.cs"
index e48dd7e..7b640ff 100644
--- "a/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/RGVJob_BC.cs"
+++ "b/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/RGVJob_BC.cs"
@@ -87,7 +87,7 @@
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == device.GetValue<R_ConveyorLineDB, int>(R_ConveyorLineDB.TaskNum) && x.TaskState == TaskStatusEnum.RGV_Executing.ObjToInt());
if (task != null)
{
- if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())//RGV鍏ュ簱浠诲姟瀹屾垚
+ if (task.TaskType >= TaskTypeEnum.Inbound.ObjToInt())//RGV鍏ュ簱浠诲姟瀹屾垚
{
List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.Roadway, task.TaskType);
Dt_Router? router = routers.FirstOrDefault();
@@ -116,8 +116,9 @@
device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);
_taskService.UpdateTask(task, TaskStatusEnum.RGV_Executing);
+ WriteDebug(device.DeviceName, $"鍏ュ簱RGV浠诲姟鍙穥task.TaskNum}宸插啓鍏�");
}
- Dt_Task task1 = _taskRepository.QueryFirst(x => x.TaskType >= TaskTypeEnum.Outbound.ObjToInt() && x.TaskState == TaskStatusEnum.RGV_Execute.ObjToInt());
+ Dt_Task task1 = _taskRepository.QueryFirst(x => x.TaskType >= TaskTypeEnum.Outbound.ObjToInt()&& x.TaskType <= TaskTypeEnum.Inbound.ObjToInt() && x.TaskState == TaskStatusEnum.RGV_Execute.ObjToInt());
if (task1 != null)
{
//鍐欏叆RGV浠诲姟
@@ -128,6 +129,7 @@
device.SetValue(W_ConveyorLineDB.STB, true, item.StationCode);
_taskService.UpdateTask(task1, TaskStatusEnum.RGV_Executing);
+ WriteDebug(device.DeviceName, $"鍑哄簱RGV浠诲姟鍙穥task1.TaskNum}宸插啓鍏�");
}
}
--
Gitblit v1.9.3