From 32885e1fc103b0c660027301219e0887cb77a847 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 27 九月 2024 19:50:03 +0800
Subject: [PATCH] 任务日志增加手动上传WMS功能；完善任务日志手动添加功能
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 65fd3b0..bcb8ec0 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -40,8 +40,10 @@
var query = _wcsDeviceRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.Text.Contains(input.SearchKey)
+ || u.StationNum.Contains(input.SearchKey)
)
.WhereIF(input.PlcId > 0, u => u.PlcId == input.PlcId)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.StationNum), u => u.StationNum.Contains(input.StationNum.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Text), u => u.Text.Contains(input.Text.Trim()))
//澶勭悊澶栭敭鍜孴reeSelector鐩稿叧瀛楁鐨勮繛鎺�
.LeftJoin<WcsPlc>((u, plcid) => u.PlcId == plcid.Id)
--
Gitblit v1.8.0