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

编码设备管理bug修改

This commit is contained in:
liang.chao 2024-11-21 10:28:44 +08:00
parent 6b632e0158
commit 80dcaa3f84
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java
View File

@ -92,7 +92,7 @@ public class StorageStatusController extends BaseController {
@GetMapping("/getAllRecords") @GetMapping("/getAllRecords")
public AjaxResult getAllRecords(StorageStatus bean) { public AjaxResult getAllRecords(StorageStatus bean) {
List<MaType> list = new ArrayList<>(); List<MaType> list = new ArrayList<>();
List<Integer> maIds = new ArrayList<>(); Set<Integer> ids = new HashSet<>();
// 获取在库maid // 获取在库maid
List<Integer> zkids = storageStatusMapper.getzk(bean); List<Integer> zkids = storageStatusMapper.getzk(bean);
// 获取在用maid // 获取在用maid
@ -101,11 +101,10 @@ public class StorageStatusController extends BaseController {
List<Integer> zxids = storageStatusMapper.getzx(bean); List<Integer> zxids = storageStatusMapper.getzx(bean);
// 获取修饰后待入库maid // 获取修饰后待入库maid
List<Integer> xshdrkids = storageStatusMapper.getxshdrk(bean); List<Integer> xshdrkids = storageStatusMapper.getxshdrk(bean);
maIds.addAll(zkids); ids.addAll(zkids);
maIds.addAll(zyids); ids.addAll(zyids);
maIds.addAll(zxids); ids.addAll(zxids);
maIds.addAll(xshdrkids); ids.addAll(xshdrkids);
Set<Integer> ids = new HashSet<>(maIds);
if (ids.size() > 0) { if (ids.size() > 0) {
startPage(); startPage();
list = storageStatusMapper.getAllRecords(ids, bean); list = storageStatusMapper.getAllRecords(ids, bean);

4
sgzb-ui/src/views/warehouseManage/machinery/coding/debug.vue
View File

@ -686,7 +686,7 @@ export default {
this.queryParams.deviceId = '' this.queryParams.deviceId = ''
this.queryParams.typeId = '' this.queryParams.typeId = ''
getListByMaType({ typeId: id }).then((response) => { getListByMaType({ typeId: id }).then((response) => {
this.typeList = response.data this.typeList = response.data.rows
}) })
}, },
//选择设备类型 //选择设备类型
@ -694,7 +694,7 @@ export default {
console.log(id) console.log(id)
this.queryParams.typeId = '' this.queryParams.typeId = ''
getListByMaType({ typeId: id }).then((response) => { getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data this.modelList = response.data.rows
}) })
}, },
/** 查询资产属性下拉 */ /** 查询资产属性下拉 */

6
sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
View File

@ -9,7 +9,7 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字999" prop="keyWord">
<el-input <el-input
v-model="queryParams.keyWord" v-model="queryParams.keyWord"
placeholder="请输入关键字" placeholder="请输入关键字"
@ -686,7 +686,7 @@ export default {
this.queryParams.deviceId = '' this.queryParams.deviceId = ''
this.queryParams.typeId = '' this.queryParams.typeId = ''
getListByMaType({ typeId: id }).then((response) => { getListByMaType({ typeId: id }).then((response) => {
this.typeList = response.data this.typeList = response.data.rows
}) })
}, },
//选择设备类型 //选择设备类型
@ -694,7 +694,7 @@ export default {
console.log(id) console.log(id)
this.queryParams.typeId = '' this.queryParams.typeId = ''
getListByMaType({ typeId: id }).then((response) => { getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data this.modelList = response.data.rows
}) })
}, },
/** 查询资产属性下拉 */ /** 查询资产属性下拉 */