From 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 16:02:38 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
index f3edd47..3ae4043 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
@@ -136,7 +136,7 @@
|| u.Info11.Contains(input.SearchKey.Trim())
|| u.Info12.Contains(input.SearchKey.Trim())
|| u.Info13.Contains(input.SearchKey.Trim())
- || u.Info14.Contains(input.SearchKey.Trim())
+ //|| u.Info14.Contains(input.SearchKey.Trim())
|| u.Info16.Contains(input.SearchKey.Trim())
|| u.Remarks.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
@@ -154,8 +154,8 @@
.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(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
- .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
+ //.WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim()))
+ .WhereIF(input.Info15 > 0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(input.PrintSheetNum>0, u => u.PrintSheetNum == input.PrintSheetNum)
.WhereIF(input.PrintNum>0, u => u.PrintNum == input.PrintNum)
--
Gitblit v1.9.3