From 3019079ca4237730b814e12361abc7c91235f973 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 26 九月 2024 16:31:48 +0800
Subject: [PATCH] 修改设备信息管理查询条件
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 2 ++
Web/src/views/wcs/wcsDevice/index.vue | 6 ++++++
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs | 5 +++++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index a1eb1a4..404b81b 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -127,6 +127,11 @@
public long? PlcId { get; set; }
/// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ public string? StationNum { get; set; }
+
+ /// <summary>
/// 鎻忚堪
/// </summary>
public string? Text { get; set; }
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)
diff --git a/Web/src/views/wcs/wcsDevice/index.vue b/Web/src/views/wcs/wcsDevice/index.vue
index 6266dc0..adb1201 100644
--- a/Web/src/views/wcs/wcsDevice/index.vue
+++ b/Web/src/views/wcs/wcsDevice/index.vue
@@ -20,6 +20,12 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="宸ヤ綅鍙�">
+ <el-input v-model="queryParams.stationNum" clearable="" placeholder="璇疯緭鍏ュ伐浣嶅彿" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="鎻忚堪">
<el-input v-model="queryParams.text" clearable="" placeholder="璇疯緭鍏ユ弿杩�" />
--
Gitblit v1.8.0