From c1c1b1f95b0880cd58afadb98d6933287fe6311c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 16:41:37 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
index 3ae4043..ab72a84 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
@@ -136,7 +136,6 @@
|| u.Info11.Contains(input.SearchKey.Trim())
|| u.Info12.Contains(input.SearchKey.Trim())
|| u.Info13.Contains(input.SearchKey.Trim())
- //|| u.Info14.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
|| u.Remarks.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
@@ -154,8 +153,7 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
- //.WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
- .WhereIF(input.Info15 > 0, u => u.Info15 == input.Info15)
+ .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(input.PrintSheetNum>0, u => u.PrintSheetNum == input.PrintSheetNum)
.WhereIF(input.PrintNum>0, u => u.PrintNum == input.PrintNum)
@@ -163,6 +161,26 @@
.WhereIF(input.IsAllowPrint.HasValue, u => u.IsAllowPrint == input.IsAllowPrint)
.WhereIF(!string.IsNullOrWhiteSpace(input.Remarks), u => u.Remarks.Contains(input.Remarks.Trim()))
.Select<WmsRecordPrintOutput>();
+ 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