总包有量可以点击查看编码设备

sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml

@@ -282,8 +282,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getAllRecords" resultType="com.bonus.sgzb.base.api.domain.MaType">
             SELECT
             mm.ma_code,
-        mt2.type_name typeName,
-        mt.type_name modelName
+            mt2.type_name AS typeName,
+            mt.type_name AS modelName
             FROM
             ma_machine mm
             LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
@@ -293,8 +293,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="ids" item="maId" open="(" separator="," close=")">
                 #{maId}
             </foreach>
+            <if test="bean != null">
                 <if test="bean.maCode != null and bean.maCode != ''">
-            and mm.ma_code like concat('%',#{bean.maCode},'%')
+                    AND mm.ma_code LIKE CONCAT('%', #{bean.maCode}, '%')
+                </if>
             </if>
     </select>
 

sgzb-ui/src/views/stquery/deviceStatusRecord.vue

@@ -351,7 +351,7 @@
               clearable
               :maxlength="30"
               style="width: 240px"
-              @keyup.enter.native="handleDialogQuery"
+              @keyup.enter.native="handleDialogAllQuery"
             />
           </el-form-item>
 
@@ -360,7 +360,7 @@
               type="primary"
               icon="el-icon-search"
               size="mini"
-              @click="handleDialogQuery"
+              @click="handleDialogAllQuery"
             >查询</el-button>
           </el-form-item>
         </el-form>
@@ -644,6 +644,10 @@ export default {
             this.queryParams.pageNum = 1
             this.getUseMaCodeList()
         },
+        handleDialogAllQuery() {
+            this.queryParams.pageNum = 1
+            this.getAllRecords()
+        },
         /** 重置按钮操作 */
         resetQuery() {
             this.queryParams.time = []