From 824a8449937515bf2ea9eff889e8dab454aa5be0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周五, 29 11月 2024 15:11:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 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..ee955e5 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
@@ -34,6 +34,31 @@
         public virtual int PackageNum { get; set; }
         
         /// <summary>
+        /// 宸蹭笅绾垮寘鏁�
+        /// </summary>
+        public virtual int UnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// 鏈笅绾垮寘鏁�
+        /// </summary>
+        public virtual int NoUnLinePackageNum { 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>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         public virtual DateTime? CreateTime { get; set; }
@@ -105,6 +130,40 @@
         /// </summary>
         public int? PackageNum { get; set; }
         
+        /// <summary>
+        /// 宸蹭笅绾垮寘鏁�
+        /// </summary>
+        public int? UnLinePackageNum { get; set; }
+        
+        /// <summary>
+        /// 鏈笅绾垮寘鏁�
+        /// </summary>
+        public int? NoUnLinePackageNum { 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>
@@ -131,6 +190,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