From ed82ad3a75afb740911cd9128fbada56566a571f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 09:15:33 +0800
Subject: [PATCH] 040310 许工说这个工位机器人达不到，强行锁定 【Editby shaocx,2024-12-23】
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 747f4ba..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
@@ -146,6 +146,16 @@
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;
@@ -156,6 +166,16 @@
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