From eec9f268552af1d0ce8c95312930770669f1cc18 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 16 八月 2024 22:40:16 +0800
Subject: [PATCH] 增加客户端需要的工序信息和短消息

---
 Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index f5a525f..c81ac27 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -54,6 +54,10 @@
         /// </summary>
         public bool IsFinished { get; set; } = false;
         /// <summary>
+        /// 鐭秷鎭�
+        /// </summary>
+        public ShortMessage ShortMsg { get; set; }
+        /// <summary>
         /// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
         /// </summary>
         public BIZ_MES_WO CurWO { get; set; }
@@ -81,6 +85,10 @@
         /// 褰撳墠鎿嶄綔杩斿洖鐨勬暟鎹�
         /// </summary>
         public object Data { get; set; }
+        /// <summary>
+        /// 宸ュ簭淇℃伅
+        /// </summary>
+        public OperInfo OperInfo { get; set; }
 
     }
 
@@ -99,7 +107,8 @@
         /// 鍖呰琛屼负褰撳墠鎵ц鐨勬搷浣滀唬鐮侊紝鍖呮嫭锛�<br/>
         /// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
         /// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
-        /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰鍚庣粨鏉熻涓�<br/>
+        /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰<br/>
+        /// Weighing锛氱О閲嶏紝瀹屾垚鍖呰鍚庡鏁翠釜鍖呰鎴愮О閲�<br/>
         /// </summary>
         public string ExecCode { get; set; }
         /// <summary>
@@ -114,6 +123,10 @@
         /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑鏍囩鏉＄爜
         /// </summary>
         public string PkgSN { get; set; }
+        /// <summary>
+        /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑閲嶉噺淇℃伅
+        /// </summary>
+        public WeightInfo WeightInfo { get; set; }
     }
 
     public class PackingActionOutput
@@ -124,6 +137,7 @@
         /// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
         /// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
         /// Complete锛氬畬鎴愶紝宸蹭繚瀛樺寘瑁呮暟鎹�<br/>
+        /// Weighing锛氱О閲嶏紝瀹屾垚鍖呰鍚庡鏁翠釜鍖呰鎴愮О閲�<br/>
         /// </summary>
         public string ExecCode { get; set; }
         /// <summary>
@@ -144,7 +158,7 @@
         public string RULE_CODE { get; set; }
         public string RULE_NAME { get; set; }
         public WipPkgItem Item { get; set; }
-        public bool IsFinished { get; set; } = false;
+        public bool IsFinished => Item.IsFinished;
     }
 
     /// <summary>
@@ -169,9 +183,16 @@
     /// </summary>
     public class AssemblySetting
     {
-        public string ItemCode { get; set; }
-        public string RuleCode { get; set; } 
-        public int Qty { get; set; } 
+        public string ITEM_CODE { get; set; }
+        public string RULE_CODE { get; set; }
+        /// <summary>
+        /// 鏄惁鎵规鐗╂枡
+        /// </summary>
+        public bool IsBatchItem { get; set; }
+        /// <summary>
+        /// 涓婃枡鏁伴噺
+        /// </summary>
+        public int QTY { get; set; }
     }
 
     /// <summary>
@@ -192,8 +213,30 @@
         public BAS_ITEM ItemInfo { get; set; }
         public string RuleCode { get; set; }
         public int LoadQty { get; set; }
+        /// <summary>
+        /// 鏄惁鎵规鐗╂枡
+        /// </summary>
+        public bool IsBatchItem { get; set; }
         public List<MES_WIP_ASSY> Records { get; set; } = new List<MES_WIP_ASSY>();
         public bool IsFinished { get; set; } = false;
+    }
 
+    /// <summary>
+    /// 绉伴噸淇℃伅
+    /// </summary>
+    public class WeightInfo
+    {
+        public double Weight { get; set; }
+        public string Unit { get; set; }
+    }
+
+    /// <summary>
+    /// 宸ュ簭淇℃伅
+    /// </summary>
+    public class OperInfo
+    {
+        public string NextNode { get; set; } = "   鈥�   ";
+        public string CurNode { get; set; } = "   鈥�   ";
+        public int InputQty { get; set; } = 0;
     }
 }

--
Gitblit v1.9.3