优化

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

@@ -100,6 +100,34 @@ public class EquipmentfileController {
         return new ResponseEntity<>(equipmentfileService.queryAll3(whereJson),HttpStatus.OK);
     }
 
+    @GetMapping("/queryivt4")
+    @Log("查询成型剂")
+    @ApiOperation("查询工令")
+    public ResponseEntity<Object> queryivt4(@RequestParam Map whereJson){
+        return new ResponseEntity<>(equipmentfileService.queryAll4(whereJson),HttpStatus.OK);
+    }
+
+    @GetMapping("/queryivt5")
+    @Log("查询成型剂")
+    @ApiOperation("查询工令")
+    public ResponseEntity<Object> queryivt5(@RequestParam Map whereJson){
+        return new ResponseEntity<>(equipmentfileService.queryAll5(whereJson),HttpStatus.OK);
+    }
+
+    @GetMapping("/queryivt6")
+    @Log("查询成型剂")
+    @ApiOperation("查询工令")
+    public ResponseEntity<Object> queryivt6(@RequestParam Map whereJson){
+        return new ResponseEntity<>(equipmentfileService.queryAll6(whereJson),HttpStatus.OK);
+    }
+
+    @GetMapping("/queryivt7")
+    @Log("查询成型剂")
+    @ApiOperation("查询工令")
+    public ResponseEntity<Object> queryivt7(@RequestParam Map whereJson){
+        return new ResponseEntity<>(equipmentfileService.queryAll7(whereJson),HttpStatus.OK);
+    }
+
     @GetMapping("/queryBomList")
     @Log("查询成型剂")
     @ApiOperation("查询工令")

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/EquipmentfileService.java

@@ -77,6 +77,30 @@ public interface EquipmentfileService {
      * @return Map<String,Object>
      */
     JSONArray queryAll3(Map whereJson);
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    JSONArray queryAll4(Map whereJson);
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    JSONArray queryAll5(Map whereJson);
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    JSONArray queryAll6(Map whereJson);
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    JSONArray queryAll7(Map whereJson);
     /**
      * 查询数据分页
      * @param whereJson 条件

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java

@@ -316,6 +316,62 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
         return ja;
     }
 
+    @Override
+    public JSONArray queryAll4(Map whereJson) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "4");
+        String devicerecord_id = map.get("devicerecord_id");
+        if (StrUtil.isEmpty(devicerecord_id)) {
+            return new JSONArray();
+        }
+        map.put("devicerecord_id", devicerecord_id);
+        JSONArray ja = WQL.getWO("QEM_EQUIPMENTFILE01")
+                .addParamMap(map).process().getResultJSONArray(0);
+        return ja;
+    }
+
+    @Override
+    public JSONArray queryAll5(Map whereJson) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "5");
+        String devicerecord_id = map.get("devicerecord_id");
+        if (StrUtil.isEmpty(devicerecord_id)) {
+            return new JSONArray();
+        }
+        map.put("devicerecord_id", devicerecord_id);
+        JSONArray ja = WQL.getWO("QEM_EQUIPMENTFILE01")
+                .addParamMap(map).process().getResultJSONArray(0);
+        return ja;
+    }
+
+    @Override
+    public JSONArray queryAll6(Map whereJson) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "6");
+        String devicerecord_id = map.get("devicerecord_id");
+        if (StrUtil.isEmpty(devicerecord_id)) {
+            return new JSONArray();
+        }
+        map.put("devicerecord_id", devicerecord_id);
+        JSONArray ja = WQL.getWO("QEM_EQUIPMENTFILE01")
+                .addParamMap(map).process().getResultJSONArray(0);
+        return ja;
+    }
+
+    @Override
+    public JSONArray queryAll7(Map whereJson) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "7");
+        String devicerecord_id = map.get("devicerecord_id");
+        if (StrUtil.isEmpty(devicerecord_id)) {
+            return new JSONArray();
+        }
+        map.put("devicerecord_id", devicerecord_id);
+        JSONArray ja = WQL.getWO("QEM_EQUIPMENTFILE01")
+                .addParamMap(map).process().getResultJSONArray(0);
+        return ja;
+    }
+
     @Override
     public JSONArray queryBomList(Map whereJson) {
         WQLObject EM_BI_DeviceBOM = WQLObject.getWQLObject("EM_BI_DeviceBOM"); // 工艺路线主表

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_EQUIPMENTFILE01.wql

@@ -187,5 +187,103 @@
             ENDQUERY
         ENDIF
 
+        IF 输入.flag = "4"
+            QUERY
+                SELECT
+                    mst.*,
+                    class.class_name,
+                    file.device_code,
+                    file.device_name,
+                    file.extend_code
+                FROM
+                    EM_BI_DeviceRepairPlanMst mst
+                    LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+                    LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                WHERE
+                    mst.is_delete = '0'
+                    AND file.is_delete = '0'
+                     OPTION 输入.devicerecord_id <> ""
+                        mst.devicerecord_id = 输入.devicerecord_id
+                      ENDOPTION
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
+        IF 输入.flag = "5"
+            QUERY
+                SELECT
+                    mst.*,
+                    class.class_name,
+                    file.device_code,
+                    file.device_name,
+                    file.extend_code
+                FROM
+                    EM_BI_DeviceMaintenancePlanMst mst
+                    LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+                    LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                WHERE
+                    mst.is_delete = '0'
+                    AND file.is_delete = '0'
+                    OPTION 输入.devicerecord_id <> ""
+                    mst.devicerecord_id = 输入.devicerecord_id
+                  ENDOPTION
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
+        IF 输入.flag = "6"
+            QUERY
+                SELECT
+                    mst.*,
+                    class.class_name,
+                    file.device_code,
+                    file.material_type_id,
+                    file.device_name,
+                    file.extend_code,
+                    d1.name AS dept_name,
+                    d2.name AS use_name
+                FROM
+                    EM_BI_DeviceRepairMst mst
+                    LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+                    LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                    LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                    LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                WHERE
+                    mst.is_delete = '0'
+                    AND file.is_delete = '0'
+                     OPTION 输入.devicerecord_id <> ""
+                    mst.devicerecord_id = 输入.devicerecord_id
+                  ENDOPTION
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
+        IF 输入.flag = "7"
+            QUERY
+                SELECT
+                    mst.*,
+                    class.class_name,
+                    file.device_code,
+                    file.material_type_id,
+                    file.device_name,
+                    file.extend_code,
+                    d1.name AS dept_name,
+                    d2.name AS use_name
+                FROM
+                    EM_BI_DeviceMaintenanceMst mst
+                    LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+                    LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                    LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                    LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                WHERE
+                    mst.is_delete = '0'
+                    AND file.is_delete = '0'
+                      OPTION 输入.devicerecord_id <> ""
+                    mst.devicerecord_id = 输入.devicerecord_id
+                  ENDOPTION
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
 
 

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

@@ -56,6 +56,37 @@ export function queryivt3(params) {
   })
 }
 
+export function queryivt4(params) {
+  return request({
+    url: 'api/equipmentfile/queryivt4',
+    method: 'get',
+    params
+  })
+}
+
+export function queryivt5(params) {
+  return request({
+    url: 'api/equipmentfile/queryivt5',
+    method: 'get',
+    params
+  })
+}
+
+export function queryivt6(params) {
+  return request({
+    url: 'api/equipmentfile/queryivt6',
+    method: 'get',
+    params
+  })
+}
+
+export function queryivt7(params) {
+  return request({
+    url: 'api/equipmentfile/queryivt7',
+    method: 'get',
+    params
+  })
+}
 export function queryBomList(params) {
   return request({
     url: 'api/equipmentfile/queryBomList',
@@ -63,4 +94,4 @@ export function queryBomList(params) {
     params
   })
 }
-export default { add, edit, del, submit, queryivt1, queryivt2, queryivt3, queryBomList }
+export default { add, edit, del, submit, queryivt1, queryivt2, queryivt3, queryivt4, queryivt5, queryivt6, queryivt7, queryBomList }

mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue

@@ -351,6 +351,13 @@ export default {
     close() {
       this.$emit('update:dialogShow', false)
       this.form = {}
+      this.tableDtl = []
+      this.tableDtl2 = []
+      this.tableDtl3 = []
+      this.tableDtl4 = []
+      this.tableDtl5 = []
+      this.tableDtl6 = []
+      this.tableDtl7 = []
       this.$emit('AddChanged')
     },
     open() {
@@ -364,6 +371,20 @@ export default {
       equipmentfile.queryivt3(this.form).then(res => {
         this.tableDtl3 = res
       })
+      equipmentfile.queryivt4(this.form).then(res => {
+        this.tableDtl4 = res
+      })
+      equipmentfile.queryivt5(this.form).then(res => {
+        this.tableDtl5 = res
+      })
+
+      equipmentfile.queryivt6(this.form).then(res => {
+        this.tableDtl6 = res
+      })
+
+      equipmentfile.queryivt7(this.form).then(res => {
+        this.tableDtl7 = res
+      })
     },
     formatInvsName(row, cloum) {
       return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]