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_Order_Gather/Dto/Mes_Order_GatherInput.cs |  140 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 136 insertions(+), 4 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
index 6ec190c..2ae725e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
@@ -24,14 +24,54 @@
         public virtual string OrderId { get; set; }
         
         /// <summary>
-        /// 鏄惁榻愬
+        /// 鏄惁涓嬬嚎
         /// </summary>
-        public virtual bool? IsKitting { get; set; }
+        public virtual bool? IsUnline { get; set; }
+        
+        /// <summary>
+        /// 涓嬬嚎鏃堕棿
+        /// </summary>
+        public virtual DateTime? UnlineTime { get; set; }
+        
+        /// <summary>
+        /// 涓嬬嚎浜�
+        /// </summary>
+        public virtual string UnlinePerson { get; set; }
         
         /// <summary>
         /// 鍖呮暟
         /// </summary>
         public virtual int PackageNum { get; set; }
+        
+        /// <summary>
+        /// 宸蹭笅绾垮寘鏁�
+        /// </summary>
+        public virtual int UnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// 鏈笅绾垮寘鏁�
+        /// </summary>
+        public virtual int NoUnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// NG鍖呮暟
+        /// </summary>
+        public virtual int? NgPackageNum { get; set; }
+        
+        /// <summary>
+        /// 鎬诲寘瑁呴潰绉�
+        /// </summary>
+        public virtual decimal AllPackageArea { get; set; }
+        
+        /// <summary>
+        /// 宸叉壂鎻忓寘瑁呴潰绉�
+        /// </summary>
+        public virtual decimal ScanPackageArea { get; set; }
+        
+        /// <summary>
+        /// 鏈壂鎻忓寘瑁呴潰绉�
+        /// </summary>
+        public virtual decimal NoScanPackageArea { get; set; }
         
         /// <summary>
         /// 鍒涘缓鏃堕棿
@@ -96,15 +136,77 @@
         public string? OrderId { get; set; }
         
         /// <summary>
-        /// 鏄惁榻愬
+        /// 鏄惁涓嬬嚎
         /// </summary>
-        public bool? IsKitting { get; set; }
+        public bool? IsUnline { get; set; }
+        
+        /// <summary>
+        /// 涓嬬嚎鏃堕棿
+        /// </summary>
+        public DateTime? UnlineTime { get; set; }
+        
+        /// <summary>
+         /// 涓嬬嚎鏃堕棿鑼冨洿
+         /// </summary>
+         public List<DateTime?> UnlineTimeRange { get; set; } 
+        /// <summary>
+        /// 涓嬬嚎浜�
+        /// </summary>
+        public string? UnlinePerson { get; set; }
         
         /// <summary>
         /// 鍖呮暟
         /// </summary>
         public int? PackageNum { get; set; }
         
+        /// <summary>
+        /// 宸蹭笅绾垮寘鏁�
+        /// </summary>
+        public int? UnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// 鏈笅绾垮寘鏁�
+        /// </summary>
+        public int? NoUnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// NG鍖呮暟
+        /// </summary>
+        public int? NgPackageNum { get; set; }
+        
+        /// <summary>
+        /// 鎬诲寘瑁呴潰绉�
+        /// </summary>
+        public decimal? AllPackageArea { get; set; }
+        
+        /// <summary>
+        /// 宸叉壂鎻忓寘瑁呴潰绉�
+        /// </summary>
+        public decimal? ScanPackageArea { get; set; }
+        
+        /// <summary>
+        /// 鏈壂鎻忓寘瑁呴潰绉�
+        /// </summary>
+        public decimal? NoScanPackageArea { 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>
@@ -131,6 +233,36 @@
         public override int PackageNum { get; set; }
         
         /// <summary>
+        /// 宸蹭笅绾垮寘鏁�
+        /// </summary>
+        [Required(ErrorMessage = "宸蹭笅绾垮寘鏁颁笉鑳戒负绌�")]
+        public override int UnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// 鏈笅绾垮寘鏁�
+        /// </summary>
+        [Required(ErrorMessage = "鏈笅绾垮寘鏁颁笉鑳戒负绌�")]
+        public override int NoUnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// 鎬诲寘瑁呴潰绉�
+        /// </summary>
+        [Required(ErrorMessage = "鎬诲寘瑁呴潰绉笉鑳戒负绌�")]
+        public override decimal AllPackageArea { get; set; }
+        
+        /// <summary>
+        /// 宸叉壂鎻忓寘瑁呴潰绉�
+        /// </summary>
+        [Required(ErrorMessage = "宸叉壂鎻忓寘瑁呴潰绉笉鑳戒负绌�")]
+        public override decimal ScanPackageArea { get; set; }
+        
+        /// <summary>
+        /// 鏈壂鎻忓寘瑁呴潰绉�
+        /// </summary>
+        [Required(ErrorMessage = "鏈壂鎻忓寘瑁呴潰绉笉鑳戒负绌�")]
+        public override decimal NoScanPackageArea { get; set; }
+        
+        /// <summary>
         /// 杞垹闄�
         /// </summary>
         [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]

--
Gitblit v1.9.3