From 559bb7b4be83575cc5fedee98484647243c96f89 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 08 四月 2026 15:57:44 +0800
Subject: [PATCH] feat: 空托盘出库完整流程 + 输送线调度优化 + S7Simulator 协议同步增强

---
 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
index f88a4e6..f1c12ab 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
@@ -82,8 +82,8 @@
                     RobotSourceAddressLineCode = stockDTO.SourceLineNo,
                     RobotTargetAddressLineCode = stockDTO.TargetLineNo,
                     RobotRoadway = stockDTO.Roadway,
-                    RobotSourceAddress = stockDTO.SourceLineNo,
-                    RobotTargetAddress = stockDTO.TargetLineNo,
+                    RobotSourceAddress = taskDTO.SourceAddress,
+                    RobotTargetAddress = taskDTO.TargetAddress,
                     RobotSourceAddressPalletCode = stockDTO.SourcePalletNo,
                     RobotTargetAddressPalletCode = stockDTO.TargetPalletNo,
                     RobotTaskType = taskDTO.TaskType,
@@ -111,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