From 83743fe4641fcfad9effc2b6104c8dedefcbdcb5 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 08 四月 2026 00:57:54 +0800
Subject: [PATCH] Merge branch 'dev'
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
index 465fcb5..e9a19e7 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
@@ -87,9 +87,10 @@
RobotSourceAddressPalletCode = stockDTO.SourcePalletNo,
RobotTargetAddressPalletCode = stockDTO.TargetPalletNo,
RobotTaskType = taskDTO.TaskType,
- RobotTaskState = taskDTO.TaskState,
+ RobotTaskState = taskDTO.TaskStatus,
RobotGrade = taskDTO.Grade,
- Creater = "WMS"
+ Creater = "WMS",
+ RobotTaskTotalNum = 0,
};
BaseDal.AddData(task);
@@ -110,6 +111,11 @@
return BaseDal.QueryFirst(x => x.RobotRoadway == deviceCode && x.RobotTaskState != (int)TaskRobotStatusEnum.RobotExecuting, TaskOrderBy);
}
+ public Dt_RobotTask? QueryRobotCraneExecutingTask(string deviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.RobotRoadway == deviceCode && x.RobotTaskState == (int)TaskRobotStatusEnum.RobotExecuting, TaskOrderBy);
+ }
+
public async Task<bool> UpdateRobotTaskAsync(Dt_RobotTask robotTask)
{
return await BaseDal.UpdateDataAsync(robotTask);
--
Gitblit v1.9.3