From 7f0d11f40765f77b640b9387584ad4f2e073befe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Thu, 10 Apr 2025 10:08:16 +0800
Subject: [PATCH] no message

---
 .../src/components/duochaxun/Kucunhuizong.vue |  8 +++----
 .../src/components/duochaxun/Kucunrizhi.vue   | 21 ++++++++++---------
 .../src/components/duochaxun/Rukuzhengli.vue  | 16 +++++++-------
 wms-vue/src/components/duochaxun/Xuliehao.vue | 16 +++++++-------
 .../components/duochaxun/Zhengliqingdan.vue   | 16 +++++++-------
 .../wms/controller/EnumerateController.java   | 14 ++++++++-----
 .../controller/ZhengliqingdanController.java  |  2 +-
 7 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/wms-vue/src/components/duochaxun/Kucunhuizong.vue b/wms-vue/src/components/duochaxun/Kucunhuizong.vue
index e123f4c..133696f 100644
--- a/wms-vue/src/components/duochaxun/Kucunhuizong.vue
+++ b/wms-vue/src/components/duochaxun/Kucunhuizong.vue
@@ -26,9 +26,9 @@
               <el-select v-model="param.propC2"  multiple filterable placeholder="请选择LOC" style="width: 100%;">
                 <el-option
                     v-for="item in LOCS"
-                    :key="item.ID"
-                    :label="item.PROP_C2"
-                    :value="item.PROP_C2"
+                    :key="item.id"
+                    :label="item.code"
+                    :value="item.code"
                 >
                 </el-option>
               </el-select>
@@ -757,7 +757,7 @@ export default {
     },
     LOC(){
       //LOC下拉列表数据加载
-      this.$axios.post(this.$httpUrl + '/Rukuzhengli/LOC', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryLoc', {
 
       }).then(res => res.data)
           .then(res => {
diff --git a/wms-vue/src/components/duochaxun/Kucunrizhi.vue b/wms-vue/src/components/duochaxun/Kucunrizhi.vue
index 25433b6..ad4d08f 100644
--- a/wms-vue/src/components/duochaxun/Kucunrizhi.vue
+++ b/wms-vue/src/components/duochaxun/Kucunrizhi.vue
@@ -48,9 +48,9 @@
               <el-select v-model="param.PROP_C2"  multiple filterable placeholder="请选择LOC" style="width: 100%;">
                 <el-option
                     v-for="item in LOCS"
-                    :key="item.ID"
-                    :label="item.PROP_C2"
-                    :value="item.PROP_C2"
+                    :key="item.id"
+                    :label="item.code"
+                    :value="item.code"
                 >
                 </el-option>
               </el-select>
@@ -69,8 +69,8 @@
             <el-form-item label="工厂">
               <el-select v-model="param.PROP_C9"  multiple filterable placeholder="请选择工厂" style="width: 100%;">
                 <el-option
-                    v-for="item in GcS"
-                    :key="item.index"
+                    v-for="item in Plant"
+                    :key="item.id"
                     :label="item.code"
                     :value="item.code"
                 >
@@ -371,6 +371,7 @@
 <script>
 import { downloadExcel } from '@/util/excelUtils';
 export default {
+  // eslint-disable-next-line vue/multi-word-component-names
   name: "Kucunrizhi",
   data() {
     return {
@@ -431,7 +432,7 @@ export default {
         LP: ''
       },
       LOCS: [],
-      GcS: [],
+      Plant: [],
       Log: [],
       checked: false,
     }
@@ -471,7 +472,7 @@ export default {
     },
     LOC(){
       //LOC下拉列表数据加载
-      this.$axios.post(this.$httpUrl + '/Rukuzhengli/LOC', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryLoc', {
 
       }).then(res => res.data)
           .then(res => {
@@ -488,12 +489,12 @@ export default {
     },
     Gc(){
       //工厂
-      this.$axios.post(this.$httpUrl + '/Enumerate/Gc', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryGc', {
 
       }).then(res => res.data)
           .then(res => {
             if (res.code == 200) {
-              this.GcS = res.data;
+              this.Plant = res.data;
             } else {
               this.$message.error('获取数据失败');
             }
@@ -504,7 +505,7 @@ export default {
           })
     },
     JdbcLogType(){
-      //LOC下拉列表数据加载
+      //日志类型
       this.$axios.post(this.$httpUrl + '/Enumerate/InventoryLogType', {
 
       }).then(res => res.data)
diff --git a/wms-vue/src/components/duochaxun/Rukuzhengli.vue b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
index 6b90fc1..2f79f0e 100644
--- a/wms-vue/src/components/duochaxun/Rukuzhengli.vue
+++ b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
@@ -27,9 +27,9 @@
               <el-select v-model="param.PROP_C9"   multiple filterable  placeholder="请选择工厂" style="width: 100%;">
                 <el-option
                     v-for="item in Plant"
-                    :key="item.ID"
-                    :label="item.PROP_C9"
-                    :value="item.PROP_C9"
+                    :key="item.id"
+                    :label="item.code"
+                    :value="item.code"
                 >
                 </el-option>
               </el-select>
@@ -41,9 +41,9 @@
               <el-select v-model="param.PROP_C2"  multiple filterable placeholder="请选择LOC" style="width: 100%;">
                 <el-option
                     v-for="item in LOCS"
-                    :key="item.ID"
-                    :label="item.PROP_C2"
-                    :value="item.PROP_C2"
+                    :key="item.id"
+                    :label="item.code"
+                    :value="item.code"
                 >
                 </el-option>
               </el-select>
@@ -499,7 +499,7 @@ export default {
     },
     LOC(){
       //LOC下拉列表数据加载
-      this.$axios.post(this.$httpUrl + '/Rukuzhengli/LOC', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryLoc', {
 
       }).then(res => res.data)
           .then(res => {
@@ -516,7 +516,7 @@ export default {
     },
     PlantS(){
       //工厂下拉列表数据加载
-      this.$axios.post(this.$httpUrl + '/Rukuzhengli/Plant', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryGc', {
 
       }).then(res => res.data)
           .then(res => {
diff --git a/wms-vue/src/components/duochaxun/Xuliehao.vue b/wms-vue/src/components/duochaxun/Xuliehao.vue
index 3682e35..a3c401d 100644
--- a/wms-vue/src/components/duochaxun/Xuliehao.vue
+++ b/wms-vue/src/components/duochaxun/Xuliehao.vue
@@ -66,9 +66,9 @@
               <el-select v-model="param.PROP_C2"  multiple filterable placeholder="请选择LOC" style="width: 100%;">
                 <el-option
                     v-for="item in Loc"
-                    :key="item.ID"
-                    :label="item.PROP_C2"
-                    :value="item.PROP_C2"
+                    :key="item.id"
+                    :label="item.code"
+                    :value="item.code"
                 >
                 </el-option>
               </el-select>
@@ -80,9 +80,9 @@
               <el-select v-model="param.PROP_C9"  multiple filterable placeholder="请选择工厂" style="width: 100%;">
                 <el-option
                     v-for="item in Plant"
-                    :key="item.ID"
-                    :label="item.PROP_C9"
-                    :value="item.PROP_C9"
+                    :key="item.id"
+                    :label="item.code"
+                    :value="item.code"
                 >
                 </el-option>
               </el-select>
@@ -522,7 +522,7 @@ export default {
     },
     PlantS(){
       //下拉数据架子啊
-      this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZPlant', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryGc', {
       }).then(res => res.data)
           .then(res => {
             if (res.code == 200) {
@@ -538,7 +538,7 @@ export default {
     },
     LocS(){
       //下拉数据架子啊
-      this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZLOC', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryLoc', {
       }).then(res => res.data)
           .then(res => {
             if (res.code == 200) {
diff --git a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
index b365ddb..faf86c3 100644
--- a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
+++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
@@ -60,9 +60,9 @@
                 <el-select v-model="param.PROP_C2"  multiple filterable placeholder="请选择LOC" style="width: 100%;">
                   <el-option
                       v-for="item in loc"
-                      :key="item.ID"
-                      :label="item.PROP_C2"
-                      :value="item.PROP_C2"
+                      :key="item.id"
+                      :label="item.code"
+                      :value="item.code"
                   >
                   </el-option>
                 </el-select>
@@ -80,9 +80,9 @@
                 <el-select v-model="param.PROP_C9"   multiple filterable  placeholder="请选择工厂" style="width: 100%;">
                   <el-option
                       v-for="item in plant"
-                      :key="item.ID"
-                      :label="item.PROP_C9"
-                      :value="item.PROP_C9"
+                      :key="item.id"
+                      :label="item.code"
+                      :value="item.code"
                   >
                   </el-option>
                 </el-select>
@@ -650,7 +650,7 @@ export default {
     },
     Plant(){
       //下拉数据架子啊
-      this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZPlant', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryGc', {
       }).then(res => res.data)
           .then(res => {
             if (res.code == 200) {
@@ -666,7 +666,7 @@ export default {
     },
     Loc(){
       //下拉数据架子啊
-      this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZLOC', {
+      this.$axios.post(this.$httpUrl + '/Enumerate/queryLoc', {
       }).then(res => res.data)
           .then(res => {
             if (res.code == 200) {
diff --git a/wms/src/main/java/com/yc/wms/controller/EnumerateController.java b/wms/src/main/java/com/yc/wms/controller/EnumerateController.java
index d7d1f5a..b261548 100644
--- a/wms/src/main/java/com/yc/wms/controller/EnumerateController.java
+++ b/wms/src/main/java/com/yc/wms/controller/EnumerateController.java
@@ -20,12 +20,16 @@ public class EnumerateController {
     @Autowired
     private JdbcQueryExample jdbcQueryExample;
     /* 工厂*/
-    @PostMapping("/Gc")
+    @PostMapping("/queryGc")
     public Result Gc() {
-        String sql = " SELECT  "
-                +"  commonCode.code, "
-                +"  commonCode.name From COMMON_CODE commonCode  "
-                +"  where commonCode.code_Type = '工厂' ";
+        String sql = "select id,code from Plant_Info;";
+        List<Map<String, Object>> mapList = jdbcQueryExample.sqlQuery(sql);
+        return Result.success(mapList);
+    }
+    /* Loc*/
+    @PostMapping("/queryLoc")
+    public Result Loc() {
+        String sql = " select id,code from Plant_Location;";
         List<Map<String, Object>> mapList = jdbcQueryExample.sqlQuery(sql);
         return Result.success(mapList);
     }
diff --git a/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java
index c2ebb6a..8afe92e 100644
--- a/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java
+++ b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java
@@ -54,7 +54,7 @@ public class ZhengliqingdanController {
     }
 
     //库区填充
-    @PostMapping("ZZONE")
+    @PostMapping("/ZZONE")
     public Result ZONE() {
         return zhengliqingdan.ZONE();
     }