From 157f34fc6e31d6c9bbb77d71f20b927deb701405 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 4 Jul 2026 10:13:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(acid):=20=E6=94=AF=E6=8C=81=E6=8C=89?=
 =?UTF-8?q?=E7=83=AD=E5=8D=B7=E5=8F=B7=E6=90=9C=E7=B4=A2=E5=AE=9E=E7=BB=A9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改前端界面将搜索选项从"按钢卷号"扩展为"按钢卷号/热卷号"
- 更新搜索标签从"钢卷号"改为"钢卷号/热卷号"
- 将输入框占位符从"EXCOILID"更新为"子卷号或热卷号"
- 修改后端SQL查询逻辑同时支持EXCOILID和HOT_COILID字段搜索
- 为两个查询方法添加热卷号搜索条件支持
---
 .../java/com/klp/framework/client/SqlServerApiClient.java   | 4 ++--
 .../views/micro/pages/acid/components/ActualPerformance.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
index 1df3862c4..e717d4f14 100644
--- a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
+++ b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
@@ -513,7 +513,7 @@ public class SqlServerApiClient {
         params.put("endRow", endRow);
         StringBuilder where = new StringBuilder();
         if (coilId != null && !coilId.trim().isEmpty()) {
-            where.append(" AND UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%'");
+            where.append(" AND (UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%' OR UPPER(HOT_COILID) LIKE '%' || UPPER(:coilId) || '%')");
             params.put("coilId", coilId.trim());
         }
         if (startDate != null && !startDate.trim().isEmpty()) {
@@ -533,7 +533,7 @@ public class SqlServerApiClient {
         Map<String, Object> params = new java.util.HashMap<>();
         StringBuilder where = new StringBuilder();
         if (coilId != null && !coilId.trim().isEmpty()) {
-            where.append(" AND UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%'");
+            where.append(" AND (UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%' OR UPPER(HOT_COILID) LIKE '%' || UPPER(:coilId) || '%')");
             params.put("coilId", coilId.trim());
         }
         if (startDate != null && !startDate.trim().isEmpty()) {
diff --git a/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue
index 9fdce0e97..02e4d84c7 100644
--- a/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue
+++ b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue
@@ -172,10 +172,10 @@
       <div class="search-panel">
         <div class="panel-title">查找</div>
         <div class="search-type-group">
-          <el-radio v-model="searchType" label="coil">按钢卷号</el-radio>
+          <el-radio v-model="searchType" label="coil">按钢卷号/热卷号</el-radio>
           <div v-if="searchType === 'coil'" class="search-field">
-            <span class="search-label">钢卷号：</span>
-            <el-input v-model="searchCoilId" size="mini" style="width:140px" placeholder="EXCOILID" />
+            <span class="search-label">钢卷号/热卷号：</span>
+            <el-input v-model="searchCoilId" size="mini" style="width:140px" placeholder="子卷号或热卷号" />
           </div>
         </div>
         <div class="search-type-group">