From 4b2e89faeb6383335db4fc4a56d3cb71565abe08 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 17:42:24 +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 | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 70f2da2..5a8be1b 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -142,7 +142,11 @@
/// </summary>
[Description("鐮佸灈鏈澘鏍囧織")]
public bool W_EndMark { get; set; }
-
+ /// <summary>
+ /// 鐮佸灈棣栨澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈棣栨澘鏍囧織")]
+ public bool W_FirstMark { get; set; }
/// <summary>
/// 鐮佸灈浠诲姟鍙�
/// </summary>
@@ -169,6 +173,11 @@
[Description("鐮佸灈浣嶇疆鍧愭爣Y")]
public short W_PalletizingPlaceY { get; set; }
/// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣Z
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣Z")]
+ public short W_PalletizingPlaceZ { get; set; }
+ /// <summary>
/// 鐮佸灈浠诲姟瀹屾垚纭
/// </summary>
[Description("鐮佸灈浠诲姟瀹屾垚纭")]
@@ -179,7 +188,16 @@
/// </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>
@@ -204,7 +222,11 @@
/// </summary>
[Description("鐮佸灈鏈澘鏍囧織")]
public string W_EndMark { get; set; }
-
+ /// <summary>
+ /// 鐮佸灈棣栨澘鏍囧織
+ /// </summary>
+ [Description("鐮佸灈棣栨澘鏍囧織")]
+ public string W_FirstMark { get; set; }
/// <summary>
/// 鐮佸灈浠诲姟鍙�
/// </summary>
@@ -230,6 +252,11 @@
/// </summary>
[Description("鐮佸灈浣嶇疆鍧愭爣Y")]
public string W_PalletizingPlaceY { get; set; }
+ /// <summary>
+ /// 鐮佸灈浣嶇疆鍧愭爣Z
+ /// </summary>
+ [Description("鐮佸灈浣嶇疆鍧愭爣Z")]
+ public string W_PalletizingPlaceZ { get; set; }
/// <summary>
/// 鐮佸灈浠诲姟瀹屾垚纭
/// </summary>
@@ -336,7 +363,16 @@
[Description("鍏ュ簱瀹屾垚宸茬‘璁�")]
public string W_InboundFinishConfirm { get; set; }
-
+ /// <summary>
+ /// 鍚堝寘浠诲姟瀹屾垚纭
+ /// </summary>
+ [Description("鍚堝寘浠诲姟瀹屾垚纭")]
+ public string W_SurroundTaskFinish { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟鍙�
+ /// </summary>
+ [Description("鍚堝寘浠诲姟鍙�")]
+ public string W_SurroundTaskNo { get; set; }
#region 鍑哄簱鐩稿叧
/// <summary>
@@ -480,6 +516,43 @@
/// </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; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟瀹屾垚
+ /// </summary>
+ [Description("鍚堝寘浠诲姟瀹屾垚")]
+ public bool R_SurrouondTaskFinish { get; set; }
+ /// <summary>
+ /// 鍚堝寘浠诲姟鍙�
+ /// </summary>
+ [Description("鍚堝寘浠诲姟鍙�")]
+ public short R_SurrouondTaskNo { get; set; }
}
public class StationDBForReadComm
@@ -539,6 +612,42 @@
/// </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; }
}
}
--
Gitblit v1.9.3