From bed4ab58ff88c866de95e9a5f29a7512ed43a7fa Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周三, 27 11月 2024 09:36:11 +0800
Subject: [PATCH] add
---
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | 319 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 291 insertions(+), 28 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index b47ac53..4fdab05 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 short W_Inbound_TaskID { get; set; }
+ /// <summary>
+ /// 鍑哄簱浠诲姟鍙�
+ /// </summary>
+ [Description("鍑哄簱浠诲姟鍙�")]
+ public short W_Outbound_TaskID { get; set; }
/// <summary>
/// 鏉ユ枡闀垮害
@@ -72,7 +77,7 @@
/// 鍒嗛厤鍑哄簱搴撲綅鍙�
/// </summary>
[Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
- public string W_Destination_Out { get; set; }
+ public int W_Destination_Out { get; set; }
/// <summary>
/// 鏄惁鏃嬭浆
@@ -118,6 +123,86 @@
/// </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>
+ /// 鐮佸灈鏈澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈鏈澘鏍囧織")]
+ public bool W_EndMark { get; set; }
+ /// <summary>
+ /// 鐮佸灈棣栨澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈棣栨澘鏍囧織")]
+ public bool W_FirstMark { get; set; }
+ /// <summary>
+ /// 鐮佸灈浠诲姟鍙�
+ /// </summary>
+ [Description("鐮佸灈浠诲姟鍙�")]
+ public short W_PalletizingTaskID { get; set; }
+ /// <summary>
+ /// 鐮佸灈鏄惁鏃嬭浆
+ /// </summary>
+ [Description("鐮佸灈鏄惁鏃嬭浆")]
+ public short W_Rotate { get; set; }
+ /// <summary>
+ /// 鐮佸灈鐩爣宸ヤ綅
+ /// </summary>
+ [Description("鐮佸灈鐩爣宸ヤ綅")]
+ public short W_PalletizingStation { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣X
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣X")]
+ public short W_PalletizingPlaceX { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣Y
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣Y")]
+ public short W_PalletizingPlaceY { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣Z
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣Z")]
+ public short W_PalletizingPlaceZ { get; set; }
+ /// <summary>
+ /// 鐮佸灈浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鐮佸灈浠诲姟瀹屾垚纭")]
+ public bool W_PalletizingTaskFinish { get; set; }
+
+ /// <summary>
+ /// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級
+ /// </summary>
+ [Description("妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級")]
+ public short W_Mode { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鍚堝寘浠诲姟瀹屾垚纭")]
+ public bool W_SurroundTaskFinish { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟鍙�
+ /// </summary>
+ [Description("鍚堝寘浠诲姟鍙�")]
+ public int W_SurroundTaskNo { get; set; }
+ /// <summary>
+ /// 鐮佸灈棣栨湯鏉�
+ /// </summary>
+ [Description("鐮佸灈棣栨湯鏉�")]
+ public short W_PalletizingBucketType { get; set; }
}
/// <summary>
@@ -136,7 +221,57 @@
/// </summary>
[Description("璇荤爜鏁版嵁瑙ｆ瀽瀹屾垚")]
public string W_DataFinish { get; set; }
-
+
+ /// <summary>
+ /// 鐮佸灈鏈澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈鏈澘鏍囧織")]
+ public string W_EndMark { get; set; }
+ /// <summary>
+ /// 鐮佸灈棣栨澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈棣栨澘鏍囧織")]
+ public string W_FirstMark { get; set; }
+ /// <summary>
+ /// 鐮佸灈浠诲姟鍙�
+ /// </summary>
+ [Description("鐮佸灈浠诲姟鍙�")]
+ public string W_PalletizingTaskID { get; set; }
+ /// <summary>
+ /// 鐮佸灈鏄惁鏃嬭浆
+ /// </summary>
+ [Description("鐮佸灈鏄惁鏃嬭浆")]
+ public string W_Rotate { get; set; }
+ /// <summary>
+ /// 鐮佸灈鐩爣宸ヤ綅
+ /// </summary>
+ [Description("鐮佸灈鐩爣宸ヤ綅")]
+ public string W_PalletizingStation { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣X
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣X")]
+ public string W_PalletizingPlaceX { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣Y
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣Y")]
+ public string W_PalletizingPlaceY { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣Z
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣Z")]
+ public string W_PalletizingPlaceZ { get; set; }
+ /// <summary>
+ /// 鐮佸灈浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鐮佸灈浠诲姟瀹屾垚纭")]
+ public string W_PalletizingTaskFinish { get; set; }
+ /// <summary>
+ /// 鐮佸灈棣栨湯鏉�
+ /// </summary>
+ [Description("鐮佸灈棣栨湯鏉�")]
+ public string W_PalletizingBucketType { get; set; }
/// <summary>
/// 榻愬淇℃伅锛�998榻愬锛�999寮傚父鍑哄簱锛�
/// </summary>
@@ -155,11 +290,9 @@
[Description("鍏ュ簱浠诲姟鍙�")]
public string W_Inbound_TaskID { get; set; }
- /// <summary>
- /// 鍑哄簱浠诲姟鍙�
- /// </summary>
- [Description("鍑哄簱浠诲姟鍙�")]
- public string W_Outbound_TaskID { get; set; }
+
+
+
/// <summary>
/// 鏉ユ枡闀垮害
@@ -179,18 +312,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锛氬己鍒跺嚭搴擄級
@@ -251,11 +372,44 @@
/// </summary>
[Description("鍏ュ簱瀹屾垚宸茬‘璁�")]
public string W_InboundFinishConfirm { get; set; }
- ///// <summary>
- ///// 浠诲姟鍙�
- ///// </summary>
- //[Description("浠诲姟鍙�")]
- //public string W_TaskID { get; set; }
+
+ /// <summary>
+ /// 鍚堝寘浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鍚堝寘浠诲姟瀹屾垚纭")]
+ public string W_SurroundTaskFinish { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟鍙�
+ /// </summary>
+ [Description("鍚堝寘浠诲姟鍙�")]
+ public string W_SurroundTaskNo { 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
}
@@ -359,6 +513,60 @@
/// </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; }
+
+ /// <summary>
+ /// 鐮佸灈鏀捐揣瀹屾垚
+ /// </summary>
+ [Description("鐮佸灈鏀捐揣瀹屾垚")]
+ public bool R_PalletizingFinish { get; set; }
+ /// <summary>
+ /// 鐮佸灈璇诲彇浠诲姟鍙�
+ /// </summary>
+ [Description("鐮佸灈璇诲彇浠诲姟鍙�")]
+ public short R_PalletizingTaskNo { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆1鐘舵��
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆1鐘舵��")]
+ public short R_PalletizingStation1 { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆2鐘舵��
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆2鐘舵��")]
+ public short R_PalletizingStation2 { get; set; }
+ /// <summary>
+ /// 鐮佸灈浠诲姟鎺ユ敹瀹屾垚
+ /// </summary>
+ [Description("鐮佸灈浠诲姟鎺ユ敹瀹屾垚")]
+ public bool R_PalletizingAck { get; set; }
+ /// <summary>
+ /// 寮哄埗鍑哄簱妯″紡
+ /// </summary>
+ [Description("寮哄埗鍑哄簱妯″紡")]
+ public bool R_ForceOutboundMode { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟瀹屾垚
+ /// </summary>
+ [Description("鍚堝寘浠诲姟瀹屾垚")]
+ public bool R_SurrouondTaskFinish { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟鍙�
+ /// </summary>
+ [Description("鍚堝寘浠诲姟鍙�")]
+ public short R_SurrouondTaskNo { get; set; }
}
public class StationDBForReadComm
@@ -405,5 +613,60 @@
[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; }
+ /// <summary>
+ /// 鐮佸灈鏀捐揣瀹屾垚
+ /// </summary>
+ [Description("鐮佸灈鏀捐揣瀹屾垚")]
+ public string R_PalletizingFinish { get; set; }
+ /// <summary>
+ /// 鐮佸灈璇诲彇浠诲姟鍙�
+ /// </summary>
+ [Description("鐮佸灈璇诲彇浠诲姟鍙�")]
+ public string R_PalletizingTaskNo { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆1鐘舵��
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆1鐘舵��")]
+ public string R_PalletizingStation1 { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆2鐘舵��
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆2鐘舵��")]
+ public string R_PalletizingStation2 { get; set; }
+
+ /// <summary>
+ /// 寮哄埗鍑哄簱妯″紡
+ /// </summary>
+ [Description("寮哄埗鍑哄簱妯″紡")]
+ public string R_ForceOutboundMode { get; set; }
+
+ /// <summary>
+ /// 鍚堝寘浠诲姟瀹屾垚
+ /// </summary>
+ [Description("鍚堝寘浠诲姟瀹屾垚")]
+ public string R_SurrouondTaskFinish { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟鍙�
+ /// </summary>
+ [Description("鍚堝寘浠诲姟鍙�")]
+ public string R_SurrouondTaskNo { get; set; }
+ /// <summary>
+ /// 鐮佸灈浠诲姟鎺ユ敹瀹屾垚
+ /// </summary>
+ [Description("鐮佸灈浠诲姟鎺ユ敹瀹屾垚")]
+ public string R_PalletizingAck { get; set; }
}
}
--
Gitblit v1.9.3