From 04d10bce51a6272d02a4a0f1b05a4f64bf73f273 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 05 8月 2025 16:48:03 +0800
Subject: [PATCH] 休眠10秒 ，2秒改为10秒 【Editby shaocx,2025-08-05】
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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..138b4db 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
@@ -136,21 +136,41 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
- .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
.WhereIF(input.IsUnline.HasValue, u => u.IsUnline == input.IsUnline)
.WhereIF(!string.IsNullOrWhiteSpace(input.UnlinePerson), u => u.UnlinePerson.Contains(input.UnlinePerson.Trim()))
.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);
+ }
+ }
+ 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);
+ }
+ }
+ if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
+ {
+ DateTime? start= input.UpdateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
+ if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
+ {
+ var end = input.UpdateTimeRange[1].Value;
+ query = query.Where(u => u.UpdateTime <= end);
}
}
return query;
--
Gitblit v1.9.3