From 81c361a3fab7d43fc14ad46777a18a1ab9215c06 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 21 11月 2024 17:57:46 +0800
Subject: [PATCH] 222

---
 SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs |  120 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 102bea2..b47ac53 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -34,7 +34,7 @@
         /// 鍒嗛厤鏀炬枡搴撲綅鍙�
         /// </summary>
         [Description("鍒嗛厤鏀炬枡搴撲綅鍙�")]
-        public string W_Destination_In { get; set; }
+        public int W_Destination_In { get; set; }
 
         /// <summary>
         /// 浠诲姟鍙�
@@ -47,20 +47,20 @@
         /// 鏉ユ枡闀垮害
         /// </summary>
         [Description("鏉ユ枡闀垮害")]
-        public string W_Length { get; set; }
+        public short W_Length { get; set; }
 
         /// <summary>
         /// 鏉ユ枡瀹藉害
         /// </summary>
         [Description("鏉ユ枡瀹藉害")]
-        public string W_Width { get; set; }
+        public short W_Width { get; set; }
 
 
         /// <summary>
         /// 鏉ユ枡楂樺害
         /// </summary>
         [Description("鏉ユ枡楂樺害")]
-        public string W_Height { get; set; }
+        public short W_Height { get; set; }
 
         /// <summary>
         /// 璇锋眰鍑哄簱
@@ -150,11 +150,16 @@
         public string W_Destination_In { get; set; }
 
         /// <summary>
-        /// 浠诲姟鍙�
+        /// 鍏ュ簱浠诲姟鍙�
         /// </summary>
-        [Description("浠诲姟鍙�")]
-        public string W_TaskID { get; set; }
+        [Description("鍏ュ簱浠诲姟鍙�")]
+        public string W_Inbound_TaskID { get; set; }
 
+        /// <summary>
+        /// 鍑哄簱浠诲姟鍙�
+        /// </summary>
+        [Description("鍑哄簱浠诲姟鍙�")]
+        public string W_Outbound_TaskID { get; set; }
 
         /// <summary>
         /// 鏉ユ枡闀垮害
@@ -186,6 +191,12 @@
         /// </summary>
         [Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
         public string W_Destination_Out { get; set; }
+
+        /// <summary>
+        /// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴�   3锛氬己鍒跺嚭搴擄級
+        /// </summary>
+        [Description("妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴�   3锛氬己鍒跺嚭搴擄級")]
+        public string W_Mode { get; set; }
 
         /// <summary>
         /// 鏄惁鏃嬭浆
@@ -232,6 +243,20 @@
         [Description("鏀炬枡Y鍋忕Щ")]
         public string W_Y_Offset { get; set; }
 
+
+
+
+        /// <summary>
+        /// 鍏ュ簱瀹屾垚宸茬‘璁�
+        /// </summary>
+        [Description("鍏ュ簱瀹屾垚宸茬‘璁�")]
+        public string W_InboundFinishConfirm { get; set; }
+        ///// <summary>
+        ///// 浠诲姟鍙�
+        ///// </summary>
+        //[Description("浠诲姟鍙�")]
+        //public string W_TaskID { get; set; }
+
     }
 
     #endregion
@@ -252,6 +277,9 @@
         /// </summary>
         [Description("璇锋眰瑙f瀽璇荤爜鏁版嵁")]
         public bool R_ReqParseData { get; set; }
+
+
+
 
         /// <summary>
         /// 璇荤爜鍣ㄨ鐮佺粨鏋�
@@ -306,6 +334,31 @@
         /// </summary>
         [Description("褰撳墠浠诲姟鍙�")]
         public int R_TaskID { get; set; }
+
+
+        /// <summary>
+        /// 鏈哄櫒浜哄叆搴撳畬鎴�
+        /// </summary>
+        [Description("鏈哄櫒浜哄叆搴撳畬鎴�")]
+        public bool R_InboundFinish { get; set; }
+
+        /// <summary>
+        /// 鏈哄櫒浜哄叆搴撳簱浣嶅彿
+        /// </summary>
+        [Description("鏈哄櫒浜哄叆搴撳簱浣嶅彿")]
+        public string R_InboundNumber { get; set; }
+
+        /// <summary>
+        /// 鏈哄櫒浜哄嚭搴撳畬鎴�
+        /// </summary>
+        [Description("鏈哄櫒浜哄嚭搴撳畬鎴�")]
+        public bool R_OutboundFinish { get; set; }
+
+        /// <summary>
+        /// 鏈哄櫒浜哄嚭搴撳簱浣嶅彿
+        /// </summary>
+        [Description("鏈哄櫒浜哄嚭搴撳簱浣嶅彿")]
+        public string R_OutboundNumber { get; set; }
     }
 
     public class StationDBForReadComm
@@ -329,57 +382,28 @@
         public String R_ReadCodeResult { get; set; }
 
         /// <summary>
-        /// 鍏夌數1鐘舵��
+        /// 鏈哄櫒浜哄叆搴撳畬鎴�
         /// </summary>
-        [Description("鍏夌數1鐘舵��")]
-        public string R_PH_1 { get; set; }
+        [Description("鏈哄櫒浜哄叆搴撳畬鎴�")]
+        public string R_InboundFinish { get; set; }
 
         /// <summary>
-        /// 鍏夌數2鐘舵��
+        /// 鏈哄櫒浜哄叆搴撳簱浣嶅彿
         /// </summary>
-        [Description("鍏夌數2鐘舵��")]
-        public string R_PH_2 { get; set; }
+        [Description("鏈哄櫒浜哄叆搴撳簱浣嶅彿")]
+        public string R_InboundNumber { get; set; }
 
         /// <summary>
-        /// 鏀跺埌浠诲姟涓嬪彂鍙嶉
+        /// 鏈哄櫒浜哄嚭搴撳畬鎴�
         /// </summary>
-        [Description("鏀跺埌浠诲姟涓嬪彂鍙嶉")]
-        public string R_ACK { get; set; }
+        [Description("鏈哄櫒浜哄嚭搴撳畬鎴�")]
+        public string R_OutboundFinish { get; set; }
 
         /// <summary>
-        /// 妯″紡
+        /// 鏈哄櫒浜哄嚭搴撳簱浣嶅彿
         /// </summary>
-        [Description("妯″紡")]
-        public string R_Model { get; set; }
+        [Description("鏈哄櫒浜哄嚭搴撳簱浣嶅彿")]
+        public string R_OutboundNumber { get; set; }
 
-        /// <summary>
-        /// 杩愯鐘舵��
-        /// </summary>
-        [Description("杩愯鐘舵��")]
-        public string R_State { get; set; }
-
-        /// <summary>
-        /// 鎶ヨ浠g爜
-        /// </summary>
-        [Description("鎶ヨ浠g爜")]
-        public string R_AlarmCode { get; set; }
-
-        /// <summary>
-        /// 褰撳墠鐩爣鍦板潃
-        /// </summary>
-        [Description("褰撳墠鐩爣鍦板潃")]
-        public string R_Destination { get; set; }
-
-        /// <summary>
-        /// 澶栧舰妫�娴�
-        /// </summary>
-        [Description("澶栧舰妫�娴�")]
-        public string R_Shape { get; set; }
-
-        /// <summary>
-        /// 褰撳墠浠诲姟鍙�
-        /// </summary>
-        [Description("褰撳墠浠诲姟鍙�")]
-        public string R_TaskID { get; set; }
     }
 }

--
Gitblit v1.9.3