From 48f4481b61e6da5878415c3bc7ad5a1881244a93 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 22 11月 2024 07:57:46 +0800 Subject: [PATCH] 2222 --- SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | 88 +++++++++++++++++++++++++++++++------------- 1 files changed, 62 insertions(+), 26 deletions(-) diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs index bbd757c..a03aaca 100644 --- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs +++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs @@ -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> /// 鏉ユ枡闀垮害 @@ -124,7 +129,14 @@ /// </summary> [Description("鍏ュ簱瀹屾垚宸茬‘璁�")] public bool W_InboundFinishConfirm { get; set; } - + + + /// <summary> + /// 鍑哄簱瀹屾垚宸茬‘璁� + /// </summary> + [Description("鍑哄簱瀹屾垚宸茬‘璁�")] + public bool W_OutboundFinishConfirm { get; set; } + } /// <summary> @@ -162,11 +174,9 @@ [Description("鍏ュ簱浠诲姟鍙�")] public string W_Inbound_TaskID { get; set; } - /// <summary> - /// 鍑哄簱浠诲姟鍙� - /// </summary> - [Description("鍑哄簱浠诲姟鍙�")] - public string W_Outbound_TaskID { get; set; } + + + /// <summary> /// 鏉ユ枡闀垮害 @@ -186,18 +196,6 @@ /// </summary> [Description("鏉ユ枡楂樺害")] public string W_Height { get; set; } - - /// <summary> - /// 璇锋眰鍑哄簱 - /// </summary> - [Description("璇锋眰鍑哄簱")] - public string W_ReqOut { get; set; } - - /// <summary> - /// 鍒嗛厤鍑哄簱搴撲綅鍙� - /// </summary> - [Description("鍒嗛厤鍑哄簱搴撲綅鍙�")] - public string W_Destination_Out { get; set; } /// <summary> /// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級 @@ -258,11 +256,35 @@ /// </summary> [Description("鍏ュ簱瀹屾垚宸茬‘璁�")] public string W_InboundFinishConfirm { get; set; } - ///// <summary> - ///// 浠诲姟鍙� - ///// </summary> - //[Description("浠诲姟鍙�")] - //public string W_TaskID { 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 } @@ -412,5 +434,19 @@ [Description("鏈哄櫒浜哄嚭搴撳簱浣嶅彿")] public string R_OutboundNumber { get; set; } + + + /// <summary> + /// 鍏ュ簱浠诲姟鍙� + /// </summary> + [Description("鍏ュ簱浠诲姟鍙�")] + public string R_Inbound_TaskID { get; set; } + + /// <summary> + /// 鍑哄簱浠诲姟鍙� + /// </summary> + [Description("鍑哄簱浠诲姟鍙�")] + public string R_Outbound_TaskID { get; set; } + } } -- Gitblit v1.9.3