From ed82ad3a75afb740911cd9128fbada56566a571f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 09:15:33 +0800
Subject: [PATCH] 040310 许工说这个工位机器人达不到，强行锁定 【Editby shaocx,2024-12-23】

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs |  278 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 198 insertions(+), 80 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
index 7f0b613..f30e287 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
@@ -4,19 +4,14 @@
 namespace Admin.NET.Application;
 
     /// <summary>
-    /// 鎵规鏁版嵁鍩虹杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鍩虹杈撳叆鍙傛暟
     /// </summary>
     public class Mes_BatchOrderUPI_NewBaseInput
     {
         /// <summary>
-        /// 鎵�鍦ㄥ尯鍩�
+        /// 閮ㄤ欢鏉＄爜
         /// </summary>
-        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
-        
-        /// <summary>
-        /// 鏉挎枡鐘舵��
-        /// </summary>
-        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
+        public virtual string UPI { get; set; }
         
         /// <summary>
         /// 鎵规鍙�
@@ -29,9 +24,19 @@
         public virtual string OrderId { get; set; }
         
         /// <summary>
-        /// 閮ㄤ欢鏉＄爜
+        /// 鐢熶骇鍗曞彿
         /// </summary>
-        public virtual string UPI { get; set; }
+        public virtual string Info5 { get; set; }
+        
+        /// <summary>
+        /// 鎵�鍦ㄥ尯鍩�
+        /// </summary>
+        public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
+        
+        /// <summary>
+        /// 鏉挎枡鐘舵��
+        /// </summary>
+        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
         
         /// <summary>
         /// 閮ㄤ欢鍚嶇О
@@ -54,29 +59,9 @@
         public virtual float Thk { get; set; }
         
         /// <summary>
-        /// 閮ㄤ欢绾圭悊
-        /// </summary>
-        public virtual string Matgrid { get; set; }
-        
-        /// <summary>
-        /// 鏄惁灏佽竟
-        /// </summary>
-        public virtual int? IsEB { get; set; }
-        
-        /// <summary>
-        /// 鎵撳瓟璁惧缂栧彿
-        /// </summary>
-        public virtual int? DRNum { get; set; }
-        
-        /// <summary>
         /// 鏄惁浼樺寲鍖呰
         /// </summary>
         public virtual int? IsPA { get; set; }
-        
-        /// <summary>
-        /// 閿垏鍥惧彿
-        /// </summary>
-        public virtual int? MaterialIndeX { get; set; }
         
         /// <summary>
         /// 鍖呰鍙�
@@ -109,11 +94,6 @@
         public virtual int? Shelf { get; set; }
         
         /// <summary>
-        /// 杞悜瑙掑害
-        /// </summary>
-        public virtual float? Rotation { get; set; }
-        
-        /// <summary>
         /// 绾哥闀�
         /// </summary>
         public virtual float? Info1 { get; set; }
@@ -127,6 +107,66 @@
         /// 绾哥楂�
         /// </summary>
         public virtual float? Info3 { get; set; }
+        
+        /// <summary>
+        /// 閿�鍞悎鍚屽崟鍙�
+        /// </summary>
+        public virtual string Info4 { get; set; }
+        
+        /// <summary>
+        /// 绗嚑鍖�
+        /// </summary>
+        public virtual string Info6 { get; set; }
+        
+        /// <summary>
+        /// 缁忛攢搴楀悕绉�
+        /// </summary>
+        public virtual string Info7 { get; set; }
+        
+        /// <summary>
+        /// 浜у搧鍚嶇О
+        /// </summary>
+        public virtual string Info8 { get; set; }
+        
+        /// <summary>
+        /// 瀹㈡埛鍚嶇О
+        /// </summary>
+        public virtual string Info10 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰缂栫爜
+        /// </summary>
+        public virtual string Info9 { get; set; }
+        
+        /// <summary>
+        /// 鑷彁or鍙戣揣
+        /// </summary>
+        public virtual string Info11 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰閮ㄤ欢鎬绘暟閲�
+        /// </summary>
+        public virtual string Info12 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰闈㈢Н
+        /// </summary>
+        public virtual string Info13 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢鏁伴噺
+        /// </summary>
+        public virtual int? Info15 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢灏哄
+        /// </summary>
+        public virtual string Info16 { get; set; }
+        
+        /// <summary>
+        /// 鏈烘鑷傛槸鍚︽棆杞�
+        /// </summary>
+        public virtual string Info17 { get; set; }
         
         /// <summary>
         /// 鍒涘缓鏃堕棿
@@ -163,10 +203,20 @@
         /// </summary>
         public virtual bool IsDelete { get; set; }
         
+        /// <summary>
+        /// 鏍囪
+        /// </summary>
+        public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+        
+        /// <summary>
+        /// 鏉愭枡
+        /// </summary>
+        public virtual string Info18 { get; set; }
+        
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
     /// </summary>
     public class Mes_BatchOrderUPI_NewInput : BasePageInput
     {
@@ -176,14 +226,9 @@
         public string? SearchKey { get; set; }
 
         /// <summary>
-        /// 鎵�鍦ㄥ尯鍩�
+        /// 閮ㄤ欢鏉＄爜
         /// </summary>
-        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
-        
-        /// <summary>
-        /// 鏉挎枡鐘舵��
-        /// </summary>
-        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
+        public string? UPI { get; set; }
         
         /// <summary>
         /// 鎵规鍙�
@@ -196,9 +241,19 @@
         public string? OrderId { get; set; }
         
         /// <summary>
-        /// 閮ㄤ欢鏉＄爜
+        /// 鐢熶骇鍗曞彿
         /// </summary>
-        public string? UPI { get; set; }
+        public string? Info5 { get; set; }
+        
+        /// <summary>
+        /// 鎵�鍦ㄥ尯鍩�
+        /// </summary>
+        public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
+        
+        /// <summary>
+        /// 鏉挎枡鐘舵��
+        /// </summary>
+        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
         
         /// <summary>
         /// 閮ㄤ欢鍚嶇О
@@ -221,29 +276,9 @@
         public float? Thk { get; set; }
         
         /// <summary>
-        /// 閮ㄤ欢绾圭悊
-        /// </summary>
-        public string? Matgrid { get; set; }
-        
-        /// <summary>
-        /// 鏄惁灏佽竟
-        /// </summary>
-        public int? IsEB { get; set; }
-        
-        /// <summary>
-        /// 鎵撳瓟璁惧缂栧彿
-        /// </summary>
-        public int? DRNum { get; set; }
-        
-        /// <summary>
         /// 鏄惁浼樺寲鍖呰
         /// </summary>
         public int? IsPA { get; set; }
-        
-        /// <summary>
-        /// 閿垏鍥惧彿
-        /// </summary>
-        public int? MaterialIndeX { get; set; }
         
         /// <summary>
         /// 鍖呰鍙�
@@ -276,11 +311,6 @@
         public int? Shelf { get; set; }
         
         /// <summary>
-        /// 杞悜瑙掑害
-        /// </summary>
-        public float? Rotation { get; set; }
-        
-        /// <summary>
         /// 绾哥闀�
         /// </summary>
         public float? Info1 { get; set; }
@@ -295,18 +325,106 @@
         /// </summary>
         public float? Info3 { get; set; }
         
+        /// <summary>
+        /// 閿�鍞悎鍚屽崟鍙�
+        /// </summary>
+        public string? Info4 { get; set; }
+        
+        /// <summary>
+        /// 绗嚑鍖�
+        /// </summary>
+        public string? Info6 { get; set; }
+        
+        /// <summary>
+        /// 缁忛攢搴楀悕绉�
+        /// </summary>
+        public string? Info7 { get; set; }
+        
+        /// <summary>
+        /// 浜у搧鍚嶇О
+        /// </summary>
+        public string? Info8 { get; set; }
+        
+        /// <summary>
+        /// 瀹㈡埛鍚嶇О
+        /// </summary>
+        public string? Info10 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰缂栫爜
+        /// </summary>
+        public string? Info9 { get; set; }
+        
+        /// <summary>
+        /// 鑷彁or鍙戣揣
+        /// </summary>
+        public string? Info11 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰閮ㄤ欢鎬绘暟閲�
+        /// </summary>
+        public string? Info12 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰闈㈢Н
+        /// </summary>
+        public string? Info13 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢鏁伴噺
+        /// </summary>
+        public int? Info15 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢灏哄
+        /// </summary>
+        public string? Info16 { get; set; }
+        
+        /// <summary>
+        /// 鏈烘鑷傛槸鍚︽棆杞�
+        /// </summary>
+        public string? Info17 { get; set; }
+        
+        /// <summary>
+        /// 鍒涘缓鏃堕棿
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+        
+        /// <summary>
+         /// 鍒涘缓鏃堕棿鑼冨洿
+         /// </summary>
+         public List<DateTime?> CreateTimeRange { get; set; } 
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        public DateTime? UpdateTime { get; set; }
+        
+        /// <summary>
+         /// 淇敼鏃堕棿鑼冨洿
+         /// </summary>
+         public List<DateTime?> UpdateTimeRange { get; set; } 
+        /// <summary>
+        /// 鏍囪
+        /// </summary>
+        public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+        
+        /// <summary>
+        /// 鏉愭枡
+        /// </summary>
+        public string? Info18 { get; set; }
+        
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁澧炲姞杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁澧炲姞杈撳叆鍙傛暟
     /// </summary>
     public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
     {
         /// <summary>
-        /// 鏉挎枡鐘舵��
+        /// 閮ㄤ欢鏉＄爜
         /// </summary>
-        [Required(ErrorMessage = "鏉挎枡鐘舵�佷笉鑳戒负绌�")]
-        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
+        [Required(ErrorMessage = "閮ㄤ欢鏉＄爜涓嶈兘涓虹┖")]
+        public override string UPI { get; set; }
         
         /// <summary>
         /// 鎵规鍙�
@@ -321,10 +439,10 @@
         public override string OrderId { get; set; }
         
         /// <summary>
-        /// 閮ㄤ欢鏉＄爜
+        /// 鏉挎枡鐘舵��
         /// </summary>
-        [Required(ErrorMessage = "閮ㄤ欢鏉＄爜涓嶈兘涓虹┖")]
-        public override string UPI { get; set; }
+        [Required(ErrorMessage = "鏉挎枡鐘舵�佷笉鑳戒负绌�")]
+        public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
         
         /// <summary>
         /// 閮ㄤ欢鍚嶇О
@@ -365,14 +483,14 @@
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁鍒犻櫎杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鍒犻櫎杈撳叆鍙傛暟
     /// </summary>
     public class DeleteMes_BatchOrderUPI_NewInput : BaseIdInput
     {
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁鏇存柊杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鏇存柊杈撳叆鍙傛暟
     /// </summary>
     public class UpdateMes_BatchOrderUPI_NewInput : AddMes_BatchOrderUPI_NewInput
     {
@@ -385,7 +503,7 @@
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
     /// </summary>
     public class QueryByIdMes_BatchOrderUPI_NewInput : DeleteMes_BatchOrderUPI_NewInput
     {

--
Gitblit v1.9.3