From 283a985dede9fd09cb820a79bb603d7ea34050fc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 14:26:17 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
index 72c5bf3..d9a25e2 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
@@ -132,20 +132,13 @@
|| u.Info5.Contains(input.SearchKey.Trim())
|| u.DetailName.Contains(input.SearchKey.Trim())
|| u.PackageCode.Contains(input.SearchKey.Trim())
- || u.Info4.Contains(input.SearchKey.Trim())
- || u.Info6.Contains(input.SearchKey.Trim())
- || u.Info7.Contains(input.SearchKey.Trim())
- || u.Info8.Contains(input.SearchKey.Trim())
- || u.Info10.Contains(input.SearchKey.Trim())
- || u.Info9.Contains(input.SearchKey.Trim())
- || u.Info11.Contains(input.SearchKey.Trim())
- || u.Info12.Contains(input.SearchKey.Trim())
- || u.Info13.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
|| u.Info17.Contains(input.SearchKey.Trim())
+ || u.Info18.Contains(input.SearchKey.Trim())
+ || u.Info6.Contains(input.SearchKey.Trim())
+ || u.Info4.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
- || u.Info18.Contains(input.SearchKey.Trim())
)
.WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
@@ -153,25 +146,17 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
.WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
.WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
+ .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName.Contains(input.DetailName.Trim()))
- .WhereIF(input.IsPA>0, u => u.IsPA == input.IsPA)
.WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
.WhereIF(input.Sequence>0, u => u.Sequence == input.Sequence)
.WhereIF(input.Shelf>0, u => u.Shelf == input.Shelf)
- .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()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Info9), u => u.Info9.Contains(input.Info9.Trim()))
- .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.Info15>0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
- .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info18), u => u.Info18.Contains(input.Info18.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
.Select<Mes_BatchOrderUPI_NewOutput>();
if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
{
--
Gitblit v1.9.3