bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
liang.chao 2024-11-20 17:44:54 +08:00
parent c815dc496c
commit d4d20747ff
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
sgzb-ui/src/views/stquery/deviceStatusRecord.vue
View File

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