From 5cc0e0c343c0bc9a3c2f77864bfb0be260df9b44 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 04 一月 2025 16:19:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
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 95f92d0..45ce138 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -754,21 +754,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