From 04d10bce51a6272d02a4a0f1b05a4f64bf73f273 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 05 8月 2025 16:48:03 +0800
Subject: [PATCH] 休眠10秒 ，2秒改为10秒 【Editby shaocx,2025-08-05】
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 39b1fba..67993d8 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
@@ -128,7 +128,6 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
u.PackageCode.Contains(input.SearchKey.Trim())
|| u.ApiMessage.Contains(input.SearchKey.Trim())
- || u.CreateOrgName.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
@@ -136,16 +135,45 @@
.WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus)
.WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum)
.WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
.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.RetTimeRange != null && input.RetTimeRange.Count >0)
+ {
+ DateTime? start= input.RetTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.RetTime >= start);
+ if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
+ {
+ var end = input.RetTimeRange[1].Value;
+ 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