代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/rest/DevicebomController.java

@@ -2,9 +2,11 @@
 package org.nl.wms.basedata.em.rest;
 
 
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.basedata.em.service.DevicebomService;
 import org.nl.wms.basedata.em.service.dto.DevicebomDto;
+import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.nl.annotation.Log;
@@ -83,4 +85,12 @@ public class DevicebomController {
     public ResponseEntity<Object> getDtl(@RequestBody JSONObject json) {
         return new ResponseEntity<>(devicebomService.getDtl(json),HttpStatus.OK);
     }
+
+    @Log("查询物料操作类型")
+    @ApiOperation("查询物料操作类型")
+    @PostMapping("/getBjId")
+    public ResponseEntity<Object> getMaterOptType(@RequestBody Map map) {
+        String materOpt_code = MapUtil.getStr(map, "materOpt_code");
+        return new ResponseEntity<>(MaterOptTypeEnum.getObj(materOpt_code), HttpStatus.OK);
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java

@@ -32,7 +32,8 @@ public enum MaterOptTypeEnum {
     YL_AND_BCP(21, "22", "原料和半成品", "('1503644353019645952','1503644359155912704')", ""),
     SPARE(22, "23", "备品备件", "('1503644361789935616')", ""),
     SBGZ(23, "24", "设备故障", "('1541964046385942528')", ""),
-    TJJ_AND_OTHER(24, "22", "添加剂和其他有色金属粉", "('1503644361697660928','1503644362838511616')", "");
+    TJJ_AND_OTHER(24, "25", "添加剂和其他有色金属粉", "('1503644361697660928','1503644362838511616')", ""),
+    BJID(25, "26", "备品备件", "1503644361789935616", "");
 
 
 

mes/qd/src/api/wms/basedata/em/devicebom.js

@@ -40,4 +40,12 @@ export function getDtl(data) {
   })
 }
 
-export default { add, edit, del, changeActive, getDtl }
+export function getBjId(data) {
+  return request({
+    url: 'api/devicebom/getBjId',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, changeActive, getDtl, getBjId }

mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue

@@ -174,6 +174,8 @@ export default {
       classes: [],
       class_idStr: null,
       materOpt_code: '23',
+      materOpt_code_2: '26',
+      classBj_id: null,
       dialogVisible: false,
       materDialog: false,
       rules: {
@@ -199,6 +201,12 @@ export default {
       // this.crud.toQuery()
       this.queryClassId()
     })
+    const data = {
+      'materOpt_code': this.materOpt_code_2
+    }
+    crudDevicebom.getBjId(data).then(res => {
+      this.classBj_id = res.class_idStr
+    })
   },
   methods: {
     [CRUD.HOOK.beforeSubmit]() {
@@ -237,7 +245,7 @@ export default {
       } else {
         const data = {}
         data.id = form.material_type_id
-        data.goal_id = '1503644361789935616'
+        data.goal_id = this.classBj_id
         this.getSubTypes(data)
       }
     },

mes/qd/src/views/wms/basedata/em/devicefaultclass/index.vue

@@ -122,6 +122,7 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+import crudDevicebom from "@/api/wms/basedata/em/devicebom";
 
 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 }
 export default {
@@ -148,6 +149,8 @@ export default {
       classes: [],
       class_idStr: null,
       materOpt_code: '23',
+      materOpt_code_2: '26',
+      classBj_id: null,
       permission: {
       },
       rules: {
@@ -162,7 +165,7 @@ export default {
         ],
         solutions: [
           { required: true, message: '解决措施不能为空', trigger: 'blur' }
-        ],
+        ]
       }}
   },
   created() {
@@ -175,12 +178,29 @@ export default {
       this.crud.toQuery()
       this.queryClassId()
     })
+    const data = {
+      'materOpt_code': this.materOpt_code_2
+    }
+    crudDevicebom.getBjId(data).then(res => {
+      this.classBj_id = res.class_idStr
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    [CRUD.HOOK.afterToCU](crud, form) {
+      debugger
+      if (!form.device_faultclass_code) {
+        this.queryClassId()
+      } else {
+        const data = {}
+        data.id = form.material_type_id
+        data.goal_id = this.classBj_id
+        this.getSubTypes(data)
+      }
+    },
     loadClass({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
         crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
@@ -208,6 +228,25 @@ export default {
           return obj
         })
       })
+    },
+    getSubTypes(id) {
+      debugger
+      crudClassstandard.getClassSuperior2(id).then(res => {
+        debugger
+        const date = res.content
+        this.buildClass(date)
+        this.classes = date
+      })
+    },
+    buildClass(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildClass(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
     }
   }
 }