From dd53f4d569ed4e48bba9b0912353d54112876342 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 29 11月 2024 14:48:38 +0800
Subject: [PATCH] 222

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
index 979ece1..f5b22c7 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
@@ -137,7 +137,19 @@
             .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
             .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
             .WhereIF(input.PackageNum>0, u => u.PackageNum == input.PackageNum)
+            .WhereIF(input.UnLinePackageNum>0, u => u.UnLinePackageNum == input.UnLinePackageNum)
+            .WhereIF(input.NoUnLinePackageNum>0, u => u.NoUnLinePackageNum == input.NoUnLinePackageNum)
             .Select<Mes_Order_GatherOutput>();
+        if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
+        {
+            DateTime? start= input.CreateTimeRange[0].Value;
+            query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
+            if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
+            {
+                var end = input.CreateTimeRange[1].Value;
+                query = query.Where(u => u.CreateTime <= end);
+            }
+        } 
         return query;
        }
 

--
Gitblit v1.9.3