From 5a3f34856055ffbbbe9c2519a52b8be50c6f4562 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周一, 25 11月 2024 13:59:28 +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 | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 3aefa22..a0a49e0 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -40,13 +40,13 @@
/// 鍏ュ簱浠诲姟鍙�
/// </summary>
[Description("鍏ュ簱浠诲姟鍙�")]
- public int W_Inbound_TaskID { get; set; }
+ public short W_Inbound_TaskID { get; set; }
/// <summary>
/// 鍑哄簱浠诲姟鍙�
/// </summary>
[Description("鍑哄簱浠诲姟鍙�")]
- public int W_Outbound_TaskID { get; set; }
+ public short W_Outbound_TaskID { get; set; }
/// <summary>
/// 鏉ユ枡闀垮害
@@ -77,7 +77,7 @@
/// 鍒嗛厤鍑哄簱搴撲綅鍙�
/// </summary>
[Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
- public string W_Destination_Out { get; set; }
+ public int W_Destination_Out { get; set; }
/// <summary>
/// 鏄惁鏃嬭浆
@@ -173,6 +173,12 @@
/// </summary>
[Description("鐮佸灈浠诲姟瀹屾垚纭")]
public bool W_PalletizingTaskFinish { get; set; }
+
+ /// <summary>
+ /// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級
+ /// </summary>
+ [Description("妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級")]
+ public short W_Mode { get; set; }
}
@@ -495,6 +501,13 @@
/// </summary>
[Description("鐮佸灈浣嶇疆2鐘舵��")]
public short R_PalletizingStation2 { get; set; }
+
+ /// <summary>
+ /// 寮哄埗鍑哄簱妯″紡
+ /// </summary>
+ [Description("寮哄埗鍑哄簱妯″紡")]
+ public bool R_ForceOutboundMode { get; set; }
+
}
public class StationDBForReadComm
@@ -574,5 +587,12 @@
/// </summary>
[Description("鐮佸灈浣嶇疆2鐘舵��")]
public string R_PalletizingStation2 { get; set; }
+
+ /// <summary>
+ /// 寮哄埗鍑哄簱妯″紡
+ /// </summary>
+ [Description("寮哄埗鍑哄簱妯″紡")]
+ public string R_ForceOutboundMode { get; set; }
+
}
}
--
Gitblit v1.9.3