From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs |  149 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 124 insertions(+), 25 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
index 4e4952a..ac89d7e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
@@ -51,6 +51,11 @@
         public byte Status { get; set; }
 
         /// <summary>
+        /// 棰勭暀
+        /// </summary>
+        public byte Undefined { get; set; }
+
+        /// <summary>
         /// 浠诲姟鍙�
         /// </summary>
         public int TaskNum { get; set; }
@@ -80,28 +85,109 @@
         /// </summary>
         public short RunStatus { get; set; }
 
+        private string _barcode;
         /// <summary>
         /// 鏉＄爜
         /// </summary>
         [DataLength(20)]
-        public string Barcode { get; set; }
+        public string Barcode
+        {
+            get { return _barcode; }
+            set { _barcode = value.Replace("\0", "").Replace("\\0", ""); }
+        }
 
         /// <summary>
         /// 棰勭暀
         /// </summary>
-        public short Sapre1 { get; set; }
+        public short Spare1 { get; set; }
 
         /// <summary>
         /// 棰勭暀
         /// </summary>
-        public short Sapre2 { get; set; }
+        public short Spare2 { get; set; }
 
         /// <summary>
         /// 浜や簰淇″彿
         /// </summary>
         public byte Signal { get; set; }
-    }
 
+
+        /// <summary>
+        /// 棰勭暀
+        /// </summary>
+        public byte Undefined2 { get; set; }
+    }
+    public class R_ConveyorLineCPInfo : DeviceCommand
+    {
+        /// <summary>
+        /// 鍒颁綅鎸囦护
+        /// </summary>
+        public short ConveyArrivaled { get; set; }
+
+        /// <summary>
+        /// 璧峰鍦板潃
+        /// </summary>
+        public short StartPos { get; set; }
+
+        /// <summary>
+        /// 缁堢偣鍦板潃
+        /// </summary>
+        public short EndPos { get; set; }
+
+        /// <summary>
+        /// 鎵樼洏鍙�
+        /// </summary>
+        /// <summary>
+        
+        [DataLength(20)]
+        public string Barcode { get; set; }
+
+        /// <summary>
+        /// 浠诲姟鍙�
+        /// </summary>
+        [DataLength(20)]
+        public string TaskNum { get; set; }
+
+        /// <summary>
+        /// 绫诲瀷
+        /// </summary>
+        public short WorkType { get; set; }
+
+        /// <summary>
+        /// 妯″紡
+        /// </summary>
+        public short WorkMode { get; set; }
+
+        /// <summary>
+        /// 鏍￠獙浣�
+        /// </summary>
+        public short CheckPos { get; set; }
+    }
+    public class R_ConveyorLineGMInfo : DeviceCommand
+    {
+        /// <summary>
+        /// 绠卞彿
+        /// </summary>
+        /// <summary>
+        [DataLength(120)]
+        public string Boxcode { get; set; }
+    }
+    public class R_ConveyorLineFLInfo : DeviceCommand
+    {
+        /// <summary>
+        /// 鎵樼洏鍙�
+        /// </summary>
+        /// <summary>
+
+        [DataLength(20)]
+        public string Barcode { get; set; }
+
+        /// <summary>
+        /// 浠诲姟鍙�
+        /// </summary>
+        [DataLength(20)]
+        public string TaskNum { get; set; }
+    }
     public class R_ConveyorLineStatus
     {
         /// <summary>
@@ -147,20 +233,22 @@
         public bool RequestUnpackPellet { get; set; }
     }
 
-    public class R_ConveyorLineSignal
+    public class ConveyorLineSignal
     {
         /// <summary>
         /// 璇锋眰淇″彿
         /// </summary>
+        [BoolIndex(0)]
         public bool STB { get; set; }
 
         /// <summary>
         /// 鍝嶅簲淇″彿
         /// </summary>
+        [BoolIndex(1)]
         public bool ACK { get; set; }
     }
 
-    public class W_ConveyorLineInfo
+    public class W_ConveyorLineInfo : DeviceCommand
     {
 
         /// <summary>
@@ -168,20 +256,9 @@
         /// </summary>
         public short ConveyorNo { get; set; }
 
-        /// <summary>
-        /// 鎻℃墜淇″彿
-        /// </summary>
-        public bool HandShake { get; set; }
+        public byte Operate { get; set; }
 
-        /// <summary>
-        /// 澶嶄綅鎶ヨ
-        /// </summary>
-        public bool ClearAlarm { get; set; }
-
-        /// <summary>
-        /// 閫�鍥�
-        /// </summary>
-        public bool Return { get; set; }
+        public byte Undefined { get; set; }
 
         /// <summary>
         /// 浠诲姟鍙�
@@ -206,21 +283,43 @@
         /// <summary>
         /// 棰勭暀
         /// </summary>
-        public short Sapre1 { get; set; }
+        public short Spare1 { get; set; }
 
         /// <summary>
         /// 棰勭暀
         /// </summary>
-        public short Sapre2 { get; set; }
+        public short Spare2 { get; set; }
 
         /// <summary>
-        /// 璇锋眰淇″彿
+        /// 浜や簰淇″彿
         /// </summary>
-        public bool STB { get; set; }
+        public byte Signal { get; set; }
+
 
         /// <summary>
-        /// 鍝嶅簲淇″彿
+        /// 棰勭暀
         /// </summary>
-        public bool ACK { get; set; }
+        public byte Undefined2 { get; set; }
+    }
+
+    public class W_ConveyorLineOperate
+    {
+        /// <summary>
+        /// 鎻℃墜淇″彿
+        /// </summary>
+        [BoolIndex(0)]
+        public bool HandShake { get; set; }
+
+        /// <summary>
+        /// 澶嶄綅鎶ヨ
+        /// </summary>
+        [BoolIndex(1)]
+        public bool ClearAlarm { get; set; }
+
+        /// <summary>
+        /// 閫�鍥�
+        /// </summary>
+        [BoolIndex(2)]
+        public bool Return { get; set; }
     }
 }

--
Gitblit v1.9.3