From d4beffac7005967f3eeb5b175170de20ab963781 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 13 九月 2024 11:35:00 +0800
Subject: [PATCH] PLC添加禁用，修改写入bug
---
Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
index 0d77413..362188f 100644
--- a/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsPlc/WcsPlcService.cs
@@ -30,11 +30,12 @@
input.SearchKey = input.SearchKey?.Trim();
var query = _wcsPlcRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
- u.IP.Contains(input.SearchKey)
+ u.IP.Contains(input.SearchKey) && u.Text.Contains(input.SearchKey)
)
.WhereIF(input.PLCType.HasValue, u => u.PLCType == input.PLCType)
.WhereIF(!string.IsNullOrWhiteSpace(input.IP), u => u.IP.Contains(input.IP.Trim()))
.WhereIF(input.Type.HasValue, u => u.Type == input.Type)
+ .WhereIF(input.Enable.HasValue, u => u.Enable == input.Enable)
.Select<WcsPlcOutput>();
return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
--
Gitblit v1.8.0