From c2d6e0a51f9e47e04a7a24a06141e4414d0ea418 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 12月 2024 13:03:40 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs | 15 +++++++++++++++
1 files changed, 15 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..4dbfc50 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,8 +137,22 @@
.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.UnlineTimeRange != null && input.UnlineTimeRange.Count >0)
+ {
+ 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;
+ query = query.Where(u => u.UnlineTime <= end);
+ }
+ }
return query;
}
--
Gitblit v1.9.3