From a4c8fa1c25d1755356afe2bfa21a66125254ce47 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期二, 03 六月 2025 14:09:22 +0800
Subject: [PATCH] 1

---
 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index e987315..6dddfda 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -200,7 +200,8 @@
             var content = CreateAndSendTask(taskDTO);
             if (content.Status)
             {
-                var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
+                //var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
+                var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode, command.Barcode);
                 if (task != null)
                 {
                     var next = task.NextAddress;
@@ -572,7 +573,7 @@
             else if (task.Roadway.Contains("JZ"))
             {
                 // 鏌ヨ鏄惁瀛樺湪闈欑疆鍑哄簱浠诲姟
-                var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+                var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&
                     (x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting ||
                      x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutNew));
 

--
Gitblit v1.9.3