From 91fc8b6e38bc225d338da190a36564183458f961 Mon Sep 17 00:00:00 2001
From: wangyu <823267011@qq.com>
Date: Tue, 26 May 2026 14:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E7=BA=A7=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml  |  5 ++++
 .../ruoyi/common/enums/DataSourceType.java    |  7 ++++-
 .../ruoyi/framework/config/DruidConfig.java   |  9 ++++++
 ruoyi-ui/src/views/mill/plan.vue              | 29 ++++++++++++++++++-
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 57f12be3..1acec0c6 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -16,6 +16,11 @@ spring:
                 url:
                 username:
                 password:
+            # 三级 klp-oa 主库（用于查询 WMS 钢卷数据）
+            klp:
+                url: jdbc:mysql://140.143.206.120:13306/klp-oa-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: klp
+                password: KeLunPu@123
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
index 4b5341d1..10523b41 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
@@ -15,5 +15,10 @@ public enum DataSourceType
     /**
      * 从库
      */
-    SLAVE
+    SLAVE,
+
+    /**
+     * 三级 klp-oa 主库
+     */
+    KLP
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
index f671b3a3..38945188 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
@@ -49,6 +49,14 @@ public class DruidConfig
         return druidProperties.dataSource(dataSource);
     }
 
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.klp")
+    public DataSource klpDataSource(DruidProperties druidProperties)
+    {
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        return druidProperties.dataSource(dataSource);
+    }
+
     @Bean(name = "dynamicDataSource")
     @Primary
     public DynamicDataSource dataSource(DataSource masterDataSource)
@@ -56,6 +64,7 @@ public class DruidConfig
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
         setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
+        setDataSource(targetDataSources, DataSourceType.KLP.name(), "klpDataSource");
         return new DynamicDataSource(masterDataSource, targetDataSources);
     }
     
diff --git a/ruoyi-ui/src/views/mill/plan.vue b/ruoyi-ui/src/views/mill/plan.vue
index e24ef5e9..aa98baef 100644
--- a/ruoyi-ui/src/views/mill/plan.vue
+++ b/ruoyi-ui/src/views/mill/plan.vue
@@ -209,7 +209,13 @@
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item label="钢卷编号" prop="inMatNo">
-              <el-input v-model="form.inMatNo" :disabled="!isNew" />
+              <el-input v-model="form.inMatNo" :disabled="!isNew"
+                @keyup.enter.native="isNew && queryKlpCoil()"
+                @blur="isNew && queryKlpCoil()"
+                placeholder="回车从三级查询钢卷数据">
+                <el-button slot="append" icon="el-icon-search"
+                  :loading="coilQuerying" @click="queryKlpCoil" v-if="isNew" />
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -323,6 +329,8 @@
 <script>
 import { listPlan, addPlan, updatePlan, delPlan, moveUpPlan, moveDownPlan, finishPlan } from '@/api/mill/plan'
 import { listAllRecipe, getRecipeDetail, addRecipe } from '@/api/mill/recipe'
+import request from '@/utils/request'
+const queryKlpCoilByNo = (coilNo) => request({ url: '/mill/klpCoil/queryByCoilNo', method: 'get', params: { coilNo } })
 
 const emptyForm = () => ({
   planId: null, planNo: '', inMatNo: '', alloyNo: '', recipeId: null, recipeNo: '',
@@ -366,6 +374,7 @@ export default {
       // 选择方案对话框
       selectRecipeVisible: false,
       selectRecipeId: null,
+      coilQuerying: false,
 
       // 保存为方案对话框
       saveAsRecipeVisible: false,
@@ -568,6 +577,24 @@ export default {
       })
     },
 
+    // ── 从三级 WMS 查询钢卷数据 ──
+    queryKlpCoil() {
+      const coilNo = (this.form.inMatNo || '').trim()
+      if (!coilNo) return
+      this.coilQuerying = true
+      queryKlpCoilByNo(coilNo).then(res => {
+        const c = res && res.data
+        if (!c) { this.$message.info('三级 WMS 中未找到该钢卷号'); return }
+        if (c.actualThickness && !this.form.inMatThick) this.form.inMatThick = c.actualThickness
+        if (c.actualWidth     && !this.form.inMatWidth) this.form.inMatWidth  = String(c.actualWidth)
+        if (c.netWeight       && !this.form.inMatWeight) this.form.inMatWeight = String(c.netWeight)
+        if (c.length          && !this.form.inMatLength) this.form.inMatLength = String(c.length)
+        this.$message.success('已从三级 WMS 自动填入钢卷数据')
+      }).catch(() => {
+        this.$message.warning('三级 WMS 查询失败，请手动填写')
+      }).finally(() => { this.coilQuerying = false })
+    },
+
     // ── 钢卷 CRUD ──
     handleAdd() {
       this.isNew = true