From aa00074986140e57be1f56272311e84abd8566ac Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:04:28 +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/Mes_Order_GatherService.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 f5b22c7..45cdcd7 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
@@ -129,6 +129,7 @@
u.Info5.Contains(input.SearchKey.Trim())
|| u.PlanNo.Contains(input.SearchKey.Trim())
|| u.OrderId.Contains(input.SearchKey.Trim())
+ || u.UnlinePerson.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
@@ -136,18 +137,20 @@
.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)
.Select<Mes_Order_GatherOutput>();
- if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
+ if(input.UnlineTimeRange != null && input.UnlineTimeRange.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)
+ DateTime? start= input.UnlineTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.UnlineTime > start);
+ if (input.UnlineTimeRange.Count >1 && input.UnlineTimeRange[1].HasValue)
{
- var end = input.CreateTimeRange[1].Value;
- query = query.Where(u => u.CreateTime <= end);
+ var end = input.UnlineTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.UnlineTime < end);
}
}
return query;
--
Gitblit v1.9.3