From c3b60d865c3457c35054446e81b352e93e00a696 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期一, 12 一月 2026 18:31:11 +0800
Subject: [PATCH] 更改了大部分功能和逻辑

---
 项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundStationAction.cs |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundStationAction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundStationAction.cs"
index f97164d..726e1c6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundStationAction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/InboundArea/InboundStationAction.cs"
@@ -21,6 +21,9 @@
     public partial class InboundAreaDispatch
     {
         public static string[] InboundStationNo = new string[] { "50301", "50302", "50303", "50304", "50305", "50306", "50307"};
+
+        private static string CLOutStationNo = "30302";
+
         public static void InboundStationAction(IDt_TaskWCSinfoRepository taskWCSinfoRepository, IDt_TaskRGVinfoRepository taskRGVinfoRepository, PLCClient client)
         {
             foreach (var item in InboundStationNo)
@@ -77,6 +80,12 @@
                 int taskNumber = int.Parse(client.ReadValue(CLineInfoDBName.R_Line_TaskNumber.ToString(), station).ToString());
                 string barcode = client.ReadValue(CLineInfoDBName.R_Line_Barcode.ToString(), station).ToString();
                 bool flag = bool.Parse(client.ReadValue(CLineInfoDBName.R_Line_LoadSleep.ToString(), station).ToString());
+                bool SB = bool.Parse(client.ReadValue(CLineInfoDBName.R_Line_DeviceNormal.ToString(), station).ToString());
+                if (!SB) 
+                {
+                    return;
+                }
+                
                 if (!flag)
                     return;
                 Dt_TaskWCSinfo wcsInfo = taskWCSinfoRepository.FindFirst(x => x.wcstask_taskNumber == taskNumber && x.wcstask_barcode == barcode);
@@ -90,7 +99,7 @@
                     string toLayer = wcsInfo.wcstask_endLocation.Substring(0, 2);
                     string stationLayer = station.Substring(3, 2);
 
-                    if (toLayer == stationLayer)
+                    if (toLayer == stationLayer) 
                     {
                         string state = string.Empty;
                         //绌烘墭鍜屽疄鎵樼殑鍏ュ簱
@@ -174,6 +183,15 @@
                     return;
                 }
 
+
+                bool flag = bool.Parse(client.ReadValue(CLineInfoDBName.R_Line_LoadSleep.ToString(), CLOutStationNo).ToString());
+                bool noflag = bool.Parse(client.ReadValue(CLineInfoDBName.R_Line_NoLoadSleep.ToString(), CLOutStationNo).ToString());
+                if (flag || !noflag)
+                {
+                    return;
+                }
+
+
                 //string lineCode = "Measure_O";
                 int taskNumber = taskWCSinfo.wcstask_taskNumber;
                 //鏌ョ湅绾夸綋鐘舵�侊紝鍑嗗缁欑嚎浣撲笅鍙戜换鍔′俊鎭�  璇诲彇閫昏緫鎺у埗鍊�

--
Gitblit v1.9.3