From 197acf666976849d9d51f0c5f78c7672b2e63a07 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 24 11月 2024 14:38:34 +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 | 129 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 128 insertions(+), 1 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 3018e1a..a0a49e0 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -77,7 +77,7 @@
/// 鍒嗛厤鍑哄簱搴撲綅鍙�
/// </summary>
[Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
- public string W_Destination_Out { get; set; }
+ public int W_Destination_Out { get; set; }
/// <summary>
/// 鏄惁鏃嬭浆
@@ -138,6 +138,43 @@
public bool W_OutboundFinishConfirm { get; set; }
/// <summary>
+ /// 鐮佸灈鏈澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈鏈澘鏍囧織")]
+ public bool W_EndMark { 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>
+ /// 鐮佸灈浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鐮佸灈浠诲姟瀹屾垚纭")]
+ public bool W_PalletizingTaskFinish { get; set; }
+
+ /// <summary>
/// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級
/// </summary>
[Description("妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級")]
@@ -161,7 +198,43 @@
/// </summary>
[Description("璇荤爜鏁版嵁瑙ｆ瀽瀹屾垚")]
public string W_DataFinish { get; set; }
+
+ /// <summary>
+ /// 鐮佸灈鏈澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈鏈澘鏍囧織")]
+ public string W_EndMark { 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>
+ /// 鐮佸灈浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鐮佸灈浠诲姟瀹屾垚纭")]
+ public string W_PalletizingTaskFinish { get; set; }
/// <summary>
/// 榻愬淇℃伅锛�998榻愬锛�999寮傚父鍑哄簱锛�
/// </summary>
@@ -407,6 +480,34 @@
/// </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_ForceOutboundMode { get; set; }
+
}
public class StationDBForReadComm
@@ -466,6 +567,32 @@
/// </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; }
}
}
--
Gitblit v1.9.3