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/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs index 51e6650..edae6d2 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs @@ -147,6 +147,7 @@ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim())) .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode) .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus) + .WhereIF(input.IsQiBao.HasValue, u => u.IsQiBao == input.IsQiBao) .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim())) @@ -155,7 +156,28 @@ .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(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag) .Select<Mes_Package_GatherOutput>(); + 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