From f02d3a8ffc05a10a64859b2a16d5d43c8abb0fb9 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期一, 23 三月 2026 11:13:36 +0800
Subject: [PATCH] 北京回长沙的最终版

---
 项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/ReInboundRequestAction.cs |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/ReInboundRequestAction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/ReInboundRequestAction.cs"
index 89daf98..32b37a2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/ReInboundRequestAction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/ReInboundRequestAction.cs"
@@ -181,9 +181,9 @@
                 {
                     //鍒ゆ柇鏄惁鏈夊搴斿眰鐨勫嚭搴撲换鍔★紝
                     int Assrscount = executingTask.Count(x => x.wcstask_endLocation == wcsInfo.wcstask_startLocation 
-                    && (x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString()
-                    || x.wcstask_state == TaskState.TaskState_Assigned.ToString() 
+                    && (x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString() || x.wcstask_state == TaskState.TaskState_Assigned.ToString() 
                     && x.wcstask_state != TaskState.TaskState_Empty_Out_Line_Executing.ToString()));
+
                     if (Assrscount == 0)
                     {
                         ReInboundRequestStationAction(taskWCSinfoRepository, client, wcsInfo);
@@ -239,6 +239,18 @@
                     int logicValue = int.Parse(client.ReadValue(CLineInfoDBName.R_Line_Logic.ToString(), lineCode).ToString());
                     if ((logicValue == 1 || logicValue == 2))
                     {
+                        // 褰撴彁鍗囨満鍦ㄥ姩鐨勬椂鍊欎笉鑳�
+                        List<Dt_TaskWCSinfo> Assrscount = taskWCSinfoRepository.Find(x =>
+                        x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString()
+                        && x.wcstask_state != TaskState.TaskState_Assigned.ToString()
+                        && x.wcstask_state != TaskState.TaskState_Empty_Out_Line_Executing.ToString()
+                        && (x.wcstask_type == TaskType.TaskType_Empty_Pallet_Outbound.ToString() || x.wcstask_type == TaskType.TaskType_Box_Pallet_Outbound.ToString()));
+                        if (Assrscount != null && Assrscount.Count > 0)
+                        {
+                            return;
+                        }
+
+
                         client.WriteValue(CLineInfoDBName.R_Line_TargetPosition.ToString(), ReInboundRequestStationNo, wcsInfo.wcstask_endPoint);
                         client.WriteValue(CLineInfoDBName.R_Line_TaskNumber.ToString(), ReInboundRequestStationNo, wcsInfo.wcstask_taskNumber);
 

--
Gitblit v1.9.3