diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/em.xls index baa7772a..912ae6e6 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/em.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/em.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java index c36ea01a..396dd9bf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java @@ -114,6 +114,7 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService { json.put("device_faultclass_code", CodeUtil.getNewCode("DEVICE_FACLASS_CODE")); json.put("device_faultclass_name", whereJson.getString("device_faultclass_name")); json.put("material_type_id", whereJson.getString("material_type_id")); + json.put("faultclass_type_id", whereJson.getString("faultclass_type_id")); json.put("solutions", whereJson.getString("solutions")); json.put("remark", whereJson.getString("remark")); json.put("create_id", currentUserId); @@ -132,6 +133,7 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService { JSONObject json = wo.query("device_faultclass_id = '" + whereJson.getString("device_faultclass_id") + "'").uniqueResult(0); json.put("device_faultclass_name", whereJson.getString("device_faultclass_name")); json.put("material_type_id", whereJson.getString("material_type_id")); + json.put("faultclass_type_id", whereJson.getString("faultclass_type_id")); json.put("solutions", whereJson.getString("solutions")); json.put("remark", whereJson.getString("remark")); json.put("update_optid", currentUserId); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql index f4ba9e56..fedd8d61 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql @@ -44,10 +44,12 @@ PAGEQUERY SELECT mst.*, - class.class_name + class.class_name, + class2.class_name AS class_name_faultclass FROM EM_BI_DeviceFaultClass mst LEFT JOIN md_pb_classstandard class ON mst.material_type_id = class.class_id + LEFT JOIN md_pb_classstandard class2 ON mst.faultclass_type_id = class2.class_id WHERE mst.is_delete = '0' diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/em.xls index 4d4fbff2..ae950397 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/em.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/em.xls differ diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue index 541fe602..bab9ef43 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue @@ -74,6 +74,17 @@ /> + + + + + @@ -105,6 +116,7 @@ + @@ -137,8 +149,7 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import UploadDialog from '@/views/wms/masterdata_manage/em/devicefaultclass/UploadDialog' import {getClassSuperior, queryClassById} from "../../../../../api/wms/basedata/master/classstandard"; - -const defaultForm = { device_faultclass_id: null, device_faultclass_code: null, device_faultclass_name: null, material_type_id: null, solutions: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } +const defaultForm = { device_faultclass_id: null, device_faultclass_code: null, device_faultclass_name: null, material_type_id: null, solutions: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, faultclass_type_id: null } export default { name: 'Devicefaultclass', components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect }, @@ -162,6 +173,7 @@ export default { return { uploadShow: false, classes: [], + classes2: [], class_idStr: null, materOpt_code: '23', materOpt_code_2: '26', @@ -175,6 +187,9 @@ export default { material_type_id: [ { required: true, message: '设备分类不能为空', trigger: 'blur' } ], + faultclass_type_id: [ + { required: true, message: '故障分类不能为空', trigger: 'blur' } + ], solutions: [ { required: true, message: '解决措施不能为空', trigger: 'blur' } ] @@ -189,6 +204,7 @@ export default { this.crud.query.class_idStr = this.class_idStr this.crud.toQuery() this.queryClassId() + this.queryClassId2() }) const data = { 'materOpt_code': this.materOpt_code_2 @@ -206,11 +222,16 @@ export default { if (!form.device_faultclass_code) { this.queryClassId() + this.queryClassId2() } else { const data = {} data.id = form.material_type_id - data.parent_id = "2" + data.parent_id = '2' this.getSubTypes(data) + const data2 = {} + data2.id = form.faultclass_type_id + data2.parent_id = '3' + this.getSubTypes2(data2) } }, tableChanged3() { @@ -244,6 +265,19 @@ export default { }) }) }, + queryClassId2() { + const param = { + 'class_idStr': '3' + } + crudClassstandard.queryClassById(param).then(res => { + this.classes2 = res.content.map(obj => { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + }) + }, getSubTypes(id) { crudClassstandard.getClassSuperior2(id).then(res => { const date = res.content @@ -251,6 +285,13 @@ export default { this.classes = date }) }, + getSubTypes2(id) { + crudClassstandard.getClassSuperior2(id).then(res => { + const date = res.content + this.buildClass(date) + this.classes2 = date + }) + }, buildClass(classes) { classes.forEach(data => { if (data.children) {