From 1b10882a0a46c8b25331ccd2628f7a2a6db8b13f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 16 12月 2024 17:35:10 +0800
Subject: [PATCH] 11

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 45cdcd7..c3bba7e 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
@@ -142,15 +142,16 @@
             .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)
+            .WhereIF(input.NgPackageNum>0, u => u.NgPackageNum == input.NgPackageNum)
             .Select<Mes_Order_GatherOutput>();
         if(input.UnlineTimeRange != null && input.UnlineTimeRange.Count >0)
         {
-            DateTime? start= input.UnlineTimeRange[0].Value.AddDays(-1);
-            query = query.WhereIF(start.HasValue, u => u.UnlineTime > start);
+            DateTime? start= input.UnlineTimeRange[0].Value;
+            query = query.WhereIF(start.HasValue, u => u.UnlineTime >= start);
             if (input.UnlineTimeRange.Count >1 && input.UnlineTimeRange[1].HasValue)
             {
-                var end = input.UnlineTimeRange[1].Value.AddDays(1);
-                query = query.Where(u => u.UnlineTime < end);
+                var end = input.UnlineTimeRange[1].Value;
+                query = query.Where(u => u.UnlineTime <= end);
             }
         } 
         return query;

--
Gitblit v1.9.3