From 2905c63ec884f531152a4e97a4d67034e8149d6d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 17 12月 2024 10:28:43 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
index 23b52c4..7dd2c72 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
@@ -138,12 +138,42 @@
.Select<MesPushPaperCutOutput>();
if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
{
- DateTime? start= input.PushTimeRange[0].Value;
- query = query.WhereIF(start.HasValue, u => u.PushTime >= start);
+ DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.PushTime > start);
if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
{
- var end = input.PushTimeRange[1].Value;
- query = query.Where(u => u.PushTime <= end);
+ var end = input.PushTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.PushTime < end);
+ }
+ }
+ if(input.RetTimeRange != null && input.RetTimeRange.Count >0)
+ {
+ DateTime? start= input.RetTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.RetTime > start);
+ if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
+ {
+ var end = input.RetTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.RetTime < 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