From 52ea328589f08585046bd519e4c57e5dce24e1dd Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 23 11月 2024 09:49:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs |  154 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 103 insertions(+), 51 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 7923139..520c357 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -28,7 +28,7 @@
         /// 榻愬淇℃伅锛�998榻愬锛�999寮傚父鍑哄簱锛�
         /// </summary>
         [Description("榻愬淇℃伅锛�998榻愬锛�999寮傚父鍑哄簱锛�")]
-        public string W_KittingInfo { get; set; }
+        public short W_KittingInfo { get; set; }
 
         /// <summary>
         /// 鍒嗛厤鏀炬枡搴撲綅鍙�
@@ -37,11 +37,16 @@
         public int W_Destination_In { get; set; }
 
         /// <summary>
-        /// 浠诲姟鍙�
+        /// 鍏ュ簱浠诲姟鍙�
         /// </summary>
-        [Description("浠诲姟鍙�")]
-        public string W_TaskID { get; set; }
+        [Description("鍏ュ簱浠诲姟鍙�")]
+        public int W_Inbound_TaskID { get; set; }
 
+        /// <summary>
+        /// 鍑哄簱浠诲姟鍙�
+        /// </summary>
+        [Description("鍑哄簱浠诲姟鍙�")]
+        public int W_Outbound_TaskID { get; set; }
 
         /// <summary>
         /// 鏉ユ枡闀垮害
@@ -118,6 +123,20 @@
         /// </summary>
         [Description("鏀炬枡Y鍋忕Щ")]
         public string W_Y_Offset { get; set; }
+
+        /// <summary>
+        /// 鍏ュ簱瀹屾垚宸茬‘璁�
+        /// </summary>
+        [Description("鍏ュ簱瀹屾垚宸茬‘璁�")]
+        public bool W_InboundFinishConfirm { get; set; }
+
+
+        /// <summary>
+        /// 鍑哄簱瀹屾垚宸茬‘璁�
+        /// </summary>
+        [Description("鍑哄簱瀹屾垚宸茬‘璁�")]
+        public bool W_OutboundFinishConfirm { get; set; }
+
     }
 
     /// <summary>
@@ -150,10 +169,13 @@
         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>
@@ -176,16 +198,10 @@
         public string W_Height { get; set; }
 
         /// <summary>
-        /// 璇锋眰鍑哄簱
+        /// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴�   3锛氬己鍒跺嚭搴擄級
         /// </summary>
-        [Description("璇锋眰鍑哄簱")]
-        public string W_ReqOut { get; set; }
-
-        /// <summary>
-        /// 鍒嗛厤鍑哄簱搴撲綅鍙�
-        /// </summary>
-        [Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
-        public string W_Destination_Out { get; set; }
+        [Description("妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴�   3锛氬己鍒跺嚭搴擄級")]
+        public string W_Mode { get; set; }
 
         /// <summary>
         /// 鏄惁鏃嬭浆
@@ -231,6 +247,44 @@
         /// </summary>
         [Description("鏀炬枡Y鍋忕Щ")]
         public string W_Y_Offset { get; set; }
+
+
+
+
+        /// <summary>
+        /// 鍏ュ簱瀹屾垚宸茬‘璁�
+        /// </summary>
+        [Description("鍏ュ簱瀹屾垚宸茬‘璁�")]
+        public string W_InboundFinishConfirm { get; set; }
+
+
+        #region 鍑哄簱鐩稿叧
+
+        /// <summary>
+        /// 鍑哄簱浠诲姟鍙�
+        /// </summary>
+        [Description("鍑哄簱浠诲姟鍙�")]
+        public string W_Outbound_TaskID { get; set; }
+
+        /// <summary>
+        /// 璇锋眰鍑哄簱
+        /// </summary>
+        [Description("璇锋眰鍑哄簱")]
+        public string W_ReqOut { get; set; }
+
+        /// <summary>
+        /// 鍒嗛厤鍑哄簱搴撲綅鍙�
+        /// </summary>
+        [Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
+        public string W_Destination_Out { get; set; }
+
+        /// <summary>
+        /// 鍑哄簱瀹屾垚宸茬‘璁�
+        /// </summary>
+        [Description("鍑哄簱瀹屾垚宸茬‘璁�")]
+        public string W_OutboundFinishConfirm { get; set; }
+
+        #endregion
 
     }
 
@@ -334,6 +388,19 @@
         /// </summary>
         [Description("鏈哄櫒浜哄嚭搴撳簱浣嶅彿")]
         public string R_OutboundNumber { get; set; }
+
+
+        /// <summary>
+        /// 鍏ュ簱浠诲姟鍙�
+        /// </summary>
+        [Description("鍏ュ簱浠诲姟鍙�")]
+        public short R_Inbound_TaskID { get; set; }
+
+        /// <summary>
+        /// 鍑哄簱浠诲姟鍙�
+        /// </summary>
+        [Description("鍑哄簱浠诲姟鍙�")]
+        public short R_Outbound_TaskID { get; set; }
     }
 
     public class StationDBForReadComm
@@ -357,57 +424,42 @@
         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; }
+        [Description("鍏ュ簱浠诲姟鍙�")]
+        public string R_Inbound_TaskID { get; set; }
 
         /// <summary>
-        /// 鎶ヨ浠g爜
+        /// 鍑哄簱浠诲姟鍙�
         /// </summary>
-        [Description("鎶ヨ浠g爜")]
-        public string R_AlarmCode { get; set; }
+        [Description("鍑哄簱浠诲姟鍙�")]
+        public string R_Outbound_TaskID { 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