From c9e3a7f0c154892f2327e300e28af53f81e40ad0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 20 2月 2025 11:03:24 +0800
Subject: [PATCH] 软件加密+ 修复 不断给plc报警的问题

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs |  383 ++++++++++++++---------------------------------------
 1 files changed, 104 insertions(+), 279 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 60db6c3..5cc2869 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,24 @@
         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>
+        /// 鏍囪
+        /// </summary>
+        public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
         
         /// <summary>
         /// 閮ㄤ欢鍚嶇О
@@ -52,31 +62,6 @@
         /// 鍘�
         /// </summary>
         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,24 +94,34 @@
         public virtual int? Shelf { get; set; }
         
         /// <summary>
-        /// 杞悜瑙掑害
+        /// 閮ㄤ欢鏁伴噺
         /// </summary>
-        public virtual float? Rotation { get; set; }
+        public virtual int? Info15 { get; set; }
         
         /// <summary>
-        /// 绾哥闀�
+        /// 閮ㄤ欢灏哄
         /// </summary>
-        public virtual float? Info1 { get; set; }
+        public virtual string Info16 { get; set; }
         
         /// <summary>
-        /// 绾哥瀹�
+        /// 鏈烘鑷傛槸鍚︽棆杞�
         /// </summary>
-        public virtual float? Info2 { get; set; }
+        public virtual string Info17 { get; set; }
         
         /// <summary>
-        /// 绾哥楂�
+        /// 鏉愭枡
         /// </summary>
-        public virtual float? Info3 { get; set; }
+        public virtual string Info18 { get; set; }
+        
+        /// <summary>
+        /// 绗嚑鍖�
+        /// </summary>
+        public virtual string Info6 { get; set; }
+        
+        /// <summary>
+        /// 閿�鍞悎鍚屽崟鍙�
+        /// </summary>
+        public virtual string Info4 { get; set; }
         
         /// <summary>
         /// 鍒涘缓鏃堕棿
@@ -166,7 +161,7 @@
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
     /// </summary>
     public class Mes_BatchOrderUPI_NewInput : BasePageInput
     {
@@ -176,14 +171,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 +186,24 @@
         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>
+        /// 鏍囪
+        /// </summary>
+        public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
         
         /// <summary>
         /// 閮ㄤ欢鍚嶇О
@@ -219,31 +224,6 @@
         /// 鍘�
         /// </summary>
         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,37 +256,65 @@
         public int? Shelf { get; set; }
         
         /// <summary>
-        /// 杞悜瑙掑害
+        /// 閮ㄤ欢鏁伴噺
         /// </summary>
-        public float? Rotation { get; set; }
+        public int? Info15 { get; set; }
         
         /// <summary>
-        /// 绾哥闀�
+        /// 閮ㄤ欢灏哄
         /// </summary>
-        public float? Info1 { get; set; }
+        public string? Info16 { get; set; }
         
         /// <summary>
-        /// 绾哥瀹�
+        /// 鏈烘鑷傛槸鍚︽棆杞�
         /// </summary>
-        public float? Info2 { get; set; }
+        public string? Info17 { get; set; }
         
         /// <summary>
-        /// 绾哥楂�
+        /// 鏉愭枡
         /// </summary>
-        public float? Info3 { get; set; }
+        public string? Info18 { get; set; }
         
+        /// <summary>
+        /// 绗嚑鍖�
+        /// </summary>
+        public string? Info6 { get; set; }
+        
+        /// <summary>
+        /// 閿�鍞悎鍚屽崟鍙�
+        /// </summary>
+        public string? Info4 { 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 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 +329,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 +373,14 @@
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁鍒犻櫎杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鍒犻櫎杈撳叆鍙傛暟
     /// </summary>
     public class DeleteMes_BatchOrderUPI_NewInput : BaseIdInput
     {
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁鏇存柊杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁鏇存柊杈撳叆鍙傛暟
     /// </summary>
     public class UpdateMes_BatchOrderUPI_NewInput : AddMes_BatchOrderUPI_NewInput
     {
@@ -385,192 +393,9 @@
     }
 
     /// <summary>
-    /// 鎵规鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
+    /// 鏉夸欢鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
     /// </summary>
     public class QueryByIdMes_BatchOrderUPI_NewInput : DeleteMes_BatchOrderUPI_NewInput
     {
 
     }
-
-public class GetBatchOrderUPIInput
-{
-    [Required]
-    [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
-    public string PlanNo { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
-    public string OrderId { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉＄爜", Length = 50)]
-    public string UPI { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "DetailName", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 50)]
-    public string DetailName { get; set; }
-
-
-    [SugarColumn(ColumnName = "Length", ColumnDescription = "闀�")]
-    public float Length { get; set; }
-
-    [SugarColumn(ColumnName = "Width", ColumnDescription = "瀹�")]
-    public float Width { get; set; }
-
-    [SugarColumn(ColumnName = "Thk", ColumnDescription = "鍘�")]
-    public float Thk { get; set; }
-
-    [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "閮ㄤ欢绾圭悊", Length = 50)]
-    public string? Matgrid { get; set; }
-
-    [SugarColumn(ColumnName = "IsEB", ColumnDescription = "鏄惁灏佽竟")]
-    public int? IsEB { get; set; }
-
-    /// <summary>
-    /// 鎵撳瓟璁惧缂栧彿 銆怑ditBy shaocx,2022-05-28銆�
-    /// 0锛氫笉鎵撳瓟
-    /// 1锛氬洓闈㈤捇
-    /// 2锛氳豹杩堝叚闈㈤捇
-    /// 5锛氬崡鍏村叚闈㈤捇
-    /// </summary>
-    [SugarColumn(ColumnName = "DRNum", ColumnDescription = "鎵撳瓟璁惧缂栧彿")]
-    public int? DRNum { get; set; }
-
-    [SugarColumn(ColumnName = "IsPA", ColumnDescription = "鏄惁浼樺寲鍖呰")]
-    public int? IsPA { get; set; }
-
-    /// <summary>
-    /// 閿垏鍥惧彿
-    /// </summary>
-    [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "閿垏鍥惧彿")]
-    public int? MaterialIndeX { get; set; }
-
-
-    #region 鍖呰绾挎湁鍏�
-
-    [Required]
-    [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
-    public string PackageCode { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "MachineXCenter", ColumnDescription = "鍖呰X鍧愭爣", Length = 50)]
-    public float? MachineXCenter { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "MachineYCenter", ColumnDescription = "鍖呰Y鍧愭爣", Length = 50)]
-    public float? MachineYCenter { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "MachineZCenter", ColumnDescription = "鍖呰Z鍧愭爣", Length = 50)]
-    public float? MachineZCenter { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "Sequence", ColumnDescription = "灞傛暟", Length = 50)]
-    public int? Sequence { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "Shelf", ColumnDescription = "娆″簭", Length = 50)]
-    public int? Shelf { get; set; }
-
-    #endregion
-
-
-    /// <summary>
-    /// 鏄惁杞悜
-    /// 0锛氫笉杞悜
-    /// 1锛氳浆鍚�
-    /// 鐩墠鍙湁鍥涢潰閽绘墠鑳借浆鍚�
-    /// </summary>
-    [Required]
-    [SugarColumn(ColumnName = "Rotation", ColumnDescription = "杞悜瑙掑害", Length = 50)]
-    public float? Rotation { get; set; }
-
-
-
-    [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
-    public float? Info1 { get; set; }
-
-    [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
-    public float? Info2 { get; set; }
-
-    [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
-    public float? Info3 { get; set; }
-    /// <summary>
-    /// 閿�鍞悎鍚屽崟鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)]
-    public string? Info4 { get; set; }
-
-    /// <summary>
-    /// 鐢熶骇鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
-    public string? Info5 { get; set; }
-
-    /// <summary>
-    /// 绗嚑鍖�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
-    public string? Info6 { get; set; }
-
-    /// <summary>
-    /// 缁忛攢搴楀悕绉�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
-    public string? Info7 { get; set; }
-
-    /// <summary>
-    /// 浜у搧鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
-    public string? Info8 { get; set; }
-
-    /// <summary>
-    /// 瀹㈡埛鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
-    public string? Info10 { get; set; }
-
-    /// <summary>
-    /// 鍖呰缂栫爜
-    /// </summary>
-    [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
-    public string? Info9 { get; set; }
-
-    /// <summary>
-    /// 鑷彁or鍙戣揣
-    /// </summary>
-    [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
-    public string? Info11 { get; set; }
-
-    /// <summary>
-    /// 鍖呰閮ㄤ欢鎬绘暟閲�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
-    public string? Info12 { get; set; }
-
-    /// <summary>
-    /// 鍖呰闈㈢Н
-    /// </summary>
-    [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
-    public string? Info13 { get; set; }
-
-    /// <summary>
-    /// 閮ㄤ欢鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
-    public string? Info14 { get; set; }
-
-    /// <summary>
-    /// 閮ㄤ欢鏁伴噺
-    /// </summary>
-    [SugarColumn(ColumnName = "Info15", ColumnDescription = "閮ㄤ欢鏁伴噺")]
-    public int? Info15 { get; set; }
-
-    /// <summary>
-    /// 閮ㄤ欢灏哄
-    /// </summary>
-    [SugarColumn(ColumnName = "Info16", ColumnDescription = "閮ㄤ欢灏哄", Length = 60)]
-    public string? Info16 { get; set; }
-}
-

--
Gitblit v1.9.3