From 92cb843826dfab531b4406102fe7dcd31b6b0775 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 08 一月 2025 14:41:12 +0800
Subject: [PATCH] 同步

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 88deaee..1f85a2b 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -175,13 +175,13 @@
                     //    command.ConveyorLineBarcode = taskGW.PalletCode;
                     //}
                     //}
-                    //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔�
-                    Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW"));
-                    if (NGtask != null)
-                    {
-                        CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask);
-                        break;
-                    }
+                    //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔�   --鍐犲畤鍙栨秷瓒呮椂妫�娴嬪悗  鎵樼洏瓒呮椂涓嶅湪鍑哄簱鑷冲紓甯稿彛
+                    //Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW"));
+                    //if (NGtask != null)
+                    //{
+                    //    CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask);
+                    //    break;
+                    //}
 
                     RequestWmsTask(conveyorLine, command, childDeviceCode);
                     break;
@@ -362,6 +362,21 @@
         {
             Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationPLC == conveyorLine.DeviceCode);
 
+            if (command.ConveyorLineBarcode.IsNullOrEmpty())
+            {
+                conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, childDeviceCode);
+                return;
+            }
+
+
+            if( conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() ==  0) //鎵樼洏姝e弽淇″彿
+            {
+
+            }; 
+
+            conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode);  //鎵樼洏鏈夋棤鐢佃姱淇″彿
+
+
 
         }
 

--
Gitblit v1.9.3