From 4eb18625f64eecc76d70be36a1ec5554e0ad78ea Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 04 一月 2025 15:31:03 +0800
Subject: [PATCH] 1

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index c445821..4aa99c2 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -751,21 +751,42 @@
                     return;
                 }
 
-                if (result1.SerialNos.Count <= 0)
+                if (stationManager.remark == "ZYNG")
                 {
+                    ConsoleHelper.WriteWarningLine($"銆愭敞娑睳G鍏ュ簱銆�");
+                    if (result1.SerialNos.Count <= 0)
+                    {
+                        ConsoleHelper.WriteWarningLine("1000");
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
 
-                    ConsoleHelper.WriteWarningLine("2");
-                    ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
-                    conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
-
+                        ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
+                    }
+                    else
+                    {
+                        ConsoleHelper.WriteWarningLine("2");
+                        ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
+                    }
                 }
                 else
                 {
-                    ConsoleHelper.WriteWarningLine("1000");
-                    conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
-                    conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
+                    if (result1.SerialNos.Count <= 0)
+                    {
 
-                    ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
+                        ConsoleHelper.WriteWarningLine("2");
+                        ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
+
+                    }
+                    else
+                    {
+                        ConsoleHelper.WriteWarningLine("1000");
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
+                        conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
+
+                        ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
+                    }
                 }
             }
             else

--
Gitblit v1.9.3