From 68ffdb50f5c39d09a11e83bbb415784cde1b6c3e Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期一, 07 四月 2025 14:31:17 +0800
Subject: [PATCH] 优化静置入库出库口交管

---
 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 3bf68c3..e383604 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -357,8 +357,18 @@
                     }
                     else
                     {
-                        // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                        var next = task.NextAddress;
+                        if (task.Roadway.Contains("JZ"))
+                        {
+                            if (StaticVariable.isStackerRun)
+                            {
+                                StaticVariable.isLineRun = false;
+                                ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+                            }
+                        }
+                        else
+                        {
+                            // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
+                            var next = task.NextAddress;
                         // 灏嗕换鍔℃槧灏勪负鍛戒护
                         var taskCommand = MapTaskCommand(task, command);
                         // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
@@ -377,6 +387,7 @@
                         ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                         // 鏇存柊浠诲姟鐘舵�佷负涓嬩竴鐘舵��
                         _taskService.UpdateTaskStatusToNext(task);
+                        }
                     }
                 }
                 else
@@ -407,6 +418,10 @@
                 // 鎹曡幏骞惰緭鍑哄紓甯镐俊鎭�
                 Console.Out.WriteLine(ex.ToString());
             }
+            finally
+            {
+                StaticVariable.isLineRun = true;
+            }
         }
 
         public string RequestInboundPlatform(string childDeviceCode, string productLine, bool IsTrayBarcode)

--
Gitblit v1.9.3