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/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
index 9845132..747f4ba 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -138,12 +138,22 @@
.Select<MesPushPackageCodeOutput>();
if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
{
- DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
- query = query.WhereIF(start.HasValue, u => u.PushTime > start);
+ DateTime? start= input.PushTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.PushTime >= start);
if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
{
- var end = input.PushTimeRange[1].Value.AddDays(1);
- query = query.Where(u => u.PushTime < end);
+ var end = input.PushTimeRange[1].Value;
+ query = query.Where(u => u.PushTime <= 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);
}
}
return query;
--
Gitblit v1.9.3