From 80dcaa3f843d361f7eae9536a7a84234979b07e0 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 21 Nov 2024 10:28:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/controller/StorageStatusController.java  | 11 +++++------
 .../views/warehouseManage/machinery/coding/debug.vue  |  4 ++--
 .../views/warehouseManage/machinery/coding/index.vue  |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
index 28ca3ac2..537336a5 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
@@ -92,7 +92,7 @@ public class StorageStatusController extends BaseController {
     @GetMapping("/getAllRecords")
     public AjaxResult getAllRecords(StorageStatus bean) {
         List<MaType> list = new ArrayList<>();
-        List<Integer> maIds = new ArrayList<>();
+        Set<Integer> ids = new HashSet<>();
         // 获取在库maid
         List<Integer> zkids = storageStatusMapper.getzk(bean);
         // 获取在用maid
@@ -101,11 +101,10 @@ public class StorageStatusController extends BaseController {
         List<Integer> zxids = storageStatusMapper.getzx(bean);
         // 获取修饰后待入库maid
         List<Integer> xshdrkids = storageStatusMapper.getxshdrk(bean);
-        maIds.addAll(zkids);
-        maIds.addAll(zyids);
-        maIds.addAll(zxids);
-        maIds.addAll(xshdrkids);
-        Set<Integer> ids = new HashSet<>(maIds);
+        ids.addAll(zkids);
+        ids.addAll(zyids);
+        ids.addAll(zxids);
+        ids.addAll(xshdrkids);
         if (ids.size() > 0) {
             startPage();
             list = storageStatusMapper.getAllRecords(ids, bean);
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/debug.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/debug.vue
index 590edc97..527ab355 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/debug.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/debug.vue
@@ -686,7 +686,7 @@ export default {
             this.queryParams.deviceId = ''
             this.queryParams.typeId = ''
             getListByMaType({ typeId: id }).then((response) => {
-                this.typeList = response.data
+                this.typeList = response.data.rows
             })
         },
         //选择设备类型
@@ -694,7 +694,7 @@ export default {
             console.log(id)
             this.queryParams.typeId = ''
             getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+                this.modelList = response.data.rows
             })
         },
         /** 查询资产属性下拉 */
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
index 5dcfa57b..5578dda8 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@@ -9,7 +9,7 @@
             v-show="showSearch"
             label-width="68px"
         >
-            <el-form-item label="关键字" prop="keyWord">
+            <el-form-item label="关键字999" prop="keyWord">
                 <el-input
                     v-model="queryParams.keyWord"
                     placeholder="请输入关键字"
@@ -686,7 +686,7 @@ export default {
             this.queryParams.deviceId = ''
             this.queryParams.typeId = ''
             getListByMaType({ typeId: id }).then((response) => {
-                this.typeList = response.data
+                this.typeList = response.data.rows
             })
         },
         //选择设备类型
@@ -694,7 +694,7 @@ export default {
             console.log(id)
             this.queryParams.typeId = ''
             getListByMaType({ typeId: id }).then((response) => {
-                this.modelList = response.data
+                this.modelList = response.data.rows
             })
         },
         /** 查询资产属性下拉 */