diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java
new file mode 100644
index 00000000..79ba8905
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java
@@ -0,0 +1,61 @@
+
+package org.nl.wms.masterdata_manage.em.rest;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @date 2022-06-16
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "设备故障分类维护管理")
+@RequestMapping("/api/devicefaultclass")
+@Slf4j
+public class DevicefaultclassController {
+
+    private final DevicefaultclassService devicefaultclassService;
+
+    @GetMapping
+    @ApiOperation("查询设备故障分类维护")
+    //@PreAuthorize("@el.check('devicefaultclass:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicefaultclassService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @ApiOperation("新增设备故障分类维护")
+    //@PreAuthorize("@el.check('devicefaultclass:add')")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        devicefaultclassService.create(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @ApiOperation("修改设备故障分类维护")
+    //@PreAuthorize("@el.check('devicefaultclass:edit')")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        devicefaultclassService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @ApiOperation("删除设备故障分类维护")
+    //@PreAuthorize("@el.check('devicefaultclass:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        devicefaultclassService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java
new file mode 100644
index 00000000..44428748
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java
@@ -0,0 +1,57 @@
+
+package org.nl.wms.masterdata_manage.em.rest;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wms.masterdata_manage.em.service.DevicemaintenanceitemsService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @date 2022-06-16
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "设备保养项目维护管理")
+@RequestMapping("/api/devicemaintenanceitems")
+@Slf4j
+public class DevicemaintenanceitemsController {
+
+    private final DevicemaintenanceitemsService devicemaintenanceitemsService;
+
+    @GetMapping
+    @ApiOperation("查询设备保养项目维护")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicemaintenanceitemsService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @ApiOperation("新增设备保养项目维护")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        devicemaintenanceitemsService.create(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @ApiOperation("修改设备保养项目维护")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        devicemaintenanceitemsService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @ApiOperation("删除设备保养项目维护")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        devicemaintenanceitemsService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java
new file mode 100644
index 00000000..330cfedf
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java
@@ -0,0 +1,57 @@
+
+package org.nl.wms.masterdata_manage.em.rest;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wms.masterdata_manage.em.service.DevicerepairitemsService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @date 2022-06-16
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "设备维修项目维护管理")
+@RequestMapping("/api/devicerepairitems")
+@Slf4j
+public class DevicerepairitemsController {
+
+    private final DevicerepairitemsService devicerepairitemsService;
+
+    @GetMapping
+    @ApiOperation("查询设备维修项目维护")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicerepairitemsService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @ApiOperation("新增设备维修项目维护")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
+        devicerepairitemsService.create(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @ApiOperation("修改设备维修项目维护")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        devicerepairitemsService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @ApiOperation("删除设备维修项目维护")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        devicerepairitemsService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java
new file mode 100644
index 00000000..98d45e59
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java
@@ -0,0 +1,72 @@
+
+package org.nl.wms.masterdata_manage.em.service;
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.wms.masterdata_manage.em.service.dto.DevicefaultclassDto;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @description 服务接口
+ * @date 2022-06-16
+ **/
+public interface DevicefaultclassService {
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> queryAll(Map whereJson, Pageable page);
+
+    /**
+     * 查询所有数据不分页
+     *
+     * @param whereJson 条件参数
+     * @return List<DevicefaultclassDto>
+     */
+    List<DevicefaultclassDto> queryAll(Map whereJson);
+
+    /**
+     * 根据ID查询
+     *
+     * @param device_faultclass_id ID
+     * @return Devicefaultclass
+     */
+    DevicefaultclassDto findById(Long device_faultclass_id);
+
+    /**
+     * 根据编码查询
+     *
+     * @param code code
+     * @return Devicefaultclass
+     */
+    DevicefaultclassDto findByCode(String code);
+
+
+    /**
+     * 创建
+     *
+     * @param whereJson /
+     */
+    void create(JSONObject whereJson);
+
+    /**
+     * 编辑
+     *
+     * @param whereJson /
+     */
+    void update(JSONObject whereJson);
+
+    /**
+     * 多选删除
+     *
+     * @param ids /
+     */
+    void deleteAll(Long[] ids);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicemaintenanceitemsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicemaintenanceitemsService.java
new file mode 100644
index 00000000..7c916b94
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicemaintenanceitemsService.java
@@ -0,0 +1,72 @@
+
+package org.nl.wms.masterdata_manage.em.service;
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @description 服务接口
+ * @date 2022-06-16
+ **/
+public interface DevicemaintenanceitemsService {
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> queryAll(Map whereJson, Pageable page);
+
+    /**
+     * 查询所有数据不分页
+     *
+     * @param whereJson 条件参数
+     * @return List<DevicemaintenanceitemsDto>
+     */
+    List<DevicemaintenanceitemsDto> queryAll(Map whereJson);
+
+    /**
+     * 根据ID查询
+     *
+     * @param maint_item_id ID
+     * @return Devicemaintenanceitems
+     */
+    DevicemaintenanceitemsDto findById(Long maint_item_id);
+
+    /**
+     * 根据编码查询
+     *
+     * @param code code
+     * @return Devicemaintenanceitems
+     */
+    DevicemaintenanceitemsDto findByCode(String code);
+
+
+    /**
+     * 创建
+     *
+     * @param whereJson /
+     */
+    void create(JSONObject whereJson);
+
+    /**
+     * 编辑
+     *
+     * @param whereJson /
+     */
+    void update(JSONObject whereJson);
+
+    /**
+     * 多选删除
+     *
+     * @param ids /
+     */
+    void deleteAll(Long[] ids);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicerepairitemsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicerepairitemsService.java
new file mode 100644
index 00000000..06e776b3
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicerepairitemsService.java
@@ -0,0 +1,72 @@
+
+package org.nl.wms.masterdata_manage.em.service;
+
+import com.alibaba.fastjson.JSONObject;
+import org.nl.wms.masterdata_manage.em.service.dto.DevicerepairitemsDto;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @description 服务接口
+ * @date 2022-06-16
+ **/
+public interface DevicerepairitemsService {
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> queryAll(Map whereJson, Pageable page);
+
+    /**
+     * 查询所有数据不分页
+     *
+     * @param whereJson 条件参数
+     * @return List<DevicerepairitemsDto>
+     */
+    List<DevicerepairitemsDto> queryAll(Map whereJson);
+
+    /**
+     * 根据ID查询
+     *
+     * @param repair_item_id ID
+     * @return Devicerepairitems
+     */
+    DevicerepairitemsDto findById(Long repair_item_id);
+
+    /**
+     * 根据编码查询
+     *
+     * @param code code
+     * @return Devicerepairitems
+     */
+    DevicerepairitemsDto findByCode(String code);
+
+
+    /**
+     * 创建
+     *
+     * @param whereJson /
+     */
+    void create(JSONObject whereJson);
+
+    /**
+     * 编辑
+     *
+     * @param whereJson /
+     */
+    void update(JSONObject whereJson);
+
+    /**
+     * 多选删除
+     *
+     * @param ids /
+     */
+    void deleteAll(Long[] ids);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicefaultclassDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicefaultclassDto.java
new file mode 100644
index 00000000..84c98701
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicefaultclassDto.java
@@ -0,0 +1,83 @@
+package org.nl.wms.masterdata_manage.em.service.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Liuxy
+ * @description /
+ * @date 2022-06-16
+ **/
+@Data
+public class DevicefaultclassDto implements Serializable {
+
+    /** 设备故障分类标识 */
+    /**
+     * 防止精度丢失
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long device_faultclass_id;
+
+    /**
+     * 设备故障分类编码
+     */
+    private String device_faultclass_code;
+
+    /**
+     * 设备故障分类名称
+     */
+    private String device_faultclass_name;
+
+    /**
+     * 设备分类标识
+     */
+    private Long material_type_id;
+
+    /**
+     * 解决措施
+     */
+    private String solutions;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private String create_time;
+
+    /**
+     * 修改人
+     */
+    private Long update_optid;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_optname;
+
+    /**
+     * 修改时间
+     */
+    private String update_time;
+
+    /**
+     * 是否删除
+     */
+    private String is_delete;
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicemaintenanceitemsDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicemaintenanceitemsDto.java
new file mode 100644
index 00000000..8cba0b52
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicemaintenanceitemsDto.java
@@ -0,0 +1,93 @@
+package org.nl.wms.masterdata_manage.em.service.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Liuxy
+ * @description /
+ * @date 2022-06-16
+ **/
+@Data
+public class DevicemaintenanceitemsDto implements Serializable {
+
+    /** 设备保养项目标识 */
+    /**
+     * 防止精度丢失
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long maint_item_id;
+
+    /**
+     * 设备保养项目编码
+     */
+    private String maint_item_code;
+
+    /**
+     * 设备保养项目名称
+     */
+    private String maint_item_name;
+
+    /**
+     * 保养等级
+     */
+    private String item_level;
+
+    /**
+     * 保养内容
+     */
+    private String contents;
+
+    /**
+     * 保养要求
+     */
+    private String requirement;
+
+    /**
+     * 验收标准
+     */
+    private String acceptancecriteria;
+
+    /**
+     * 创建人
+     */
+    private Long create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private String create_time;
+
+    /**
+     * 修改人
+     */
+    private Long update_optid;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_optname;
+
+    /**
+     * 修改时间
+     */
+    private String update_time;
+
+    /**
+     * 是否删除
+     */
+    private String is_delete;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicerepairitemsDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicerepairitemsDto.java
new file mode 100644
index 00000000..75da3534
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/dto/DevicerepairitemsDto.java
@@ -0,0 +1,54 @@
+package org.nl.wms.masterdata_manage.em.service.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+* @description /
+* @author Liuxy
+* @date 2022-06-16
+**/
+@Data
+public class DevicerepairitemsDto implements Serializable {
+
+            /** 设备维修项目标识 */
+                /** 防止精度丢失 */
+                @JsonSerialize(using= ToStringSerializer.class)
+        private Long repair_item_id;
+
+            /** 设备维修项目编码 */
+        private String repair_item_code;
+
+            /** 设备维修项目名称 */
+        private String repair_item_name;
+
+            /** 维修要求 */
+        private String requirement;
+
+            /** 创建人 */
+        private Long create_id;
+
+            /** 创建人姓名 */
+        private String create_name;
+
+            /** 创建时间 */
+        private String create_time;
+
+            /** 修改人 */
+        private Long update_optid;
+
+            /** 修改人姓名 */
+        private String update_optname;
+
+            /** 修改时间 */
+        private String update_time;
+
+            /** 是否删除 */
+        private String is_delete;
+
+            /** 备注 */
+        private String remark;
+}
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
new file mode 100644
index 00000000..bf432109
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java
@@ -0,0 +1,151 @@
+
+package org.nl.wms.masterdata_manage.em.service.impl;
+
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService;
+import org.nl.wms.masterdata_manage.em.service.dto.DevicefaultclassDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @description 服务实现
+ * @date 2022-06-16
+ **/
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DevicefaultclassServiceImpl implements DevicefaultclassService {
+    private final ClassstandardService classstandardService;
+
+    @Override
+    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+        String device_faultclass_code = MapUtil.getStr(whereJson, "device_faultclass_code");
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "1");
+        if (ObjectUtil.isNotEmpty(device_faultclass_code)) map.put("device_faultclass_code","%"+device_faultclass_code+"%");
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", classIds);
+        }
+        JSONObject json = WQL.getWO("EM_BI_DEVICEFAULTCLASS").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.device_faultclass_code DESC");
+        return json;
+    }
+
+    @Override
+    public List<DevicefaultclassDto> queryAll(Map whereJson) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
+        JSONArray arr = wo.query().getResultJSONArray(0);
+        if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DevicefaultclassDto.class);
+        return null;
+    }
+
+    @Override
+    public DevicefaultclassDto findById(Long device_faultclass_id) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
+        JSONObject json = wo.query("device_faultclass_id = '" + device_faultclass_id + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)) {
+            return json.toJavaObject(DevicefaultclassDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    public DevicefaultclassDto findByCode(String code) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
+        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)) {
+            return json.toJavaObject(DevicefaultclassDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(JSONObject whereJson) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
+
+        JSONObject json = new JSONObject();
+        json.put("device_faultclass_id", IdUtil.getSnowflake(1,1).nextId());
+        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("solutions", whereJson.getString("solutions"));
+        json.put("remark", whereJson.getString("remark"));
+        json.put("create_id", currentUserId);
+        json.put("create_name", nickName);
+        json.put("create_time", now);
+        wo.insert(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(JSONObject whereJson) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
+        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("solutions", whereJson.getString("solutions"));
+        json.put("remark", whereJson.getString("remark"));
+        json.put("update_optid", currentUserId);
+        json.put("update_optname", nickName);
+        json.put("update_time", DateUtil.now());
+        wo.update(json);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(Long[] ids) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
+        for (Long device_faultclass_id : ids) {
+            JSONObject param = new JSONObject();
+            param.put("device_faultclass_id", String.valueOf(device_faultclass_id));
+            param.put("is_delete", "1");
+            param.put("update_optid", currentUserId);
+            param.put("update_optname", nickName);
+            param.put("update_time", now);
+            wo.update(param);
+        }
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicemaintenanceitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicemaintenanceitemsServiceImpl.java
new file mode 100644
index 00000000..6221f8d4
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicemaintenanceitemsServiceImpl.java
@@ -0,0 +1,168 @@
+
+package org.nl.wms.masterdata_manage.em.service.impl;
+
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.masterdata_manage.em.service.DevicemaintenanceitemsService;
+import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @description 服务实现
+ * @date 2022-06-16
+ **/
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DevicemaintenanceitemsServiceImpl implements DevicemaintenanceitemsService {
+
+    private final ClassstandardService classstandardService;
+
+    @Override
+    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+
+        String maint_item_code = MapUtil.getStr(whereJson, "maint_item_code");
+        String contents = MapUtil.getStr(whereJson, "contents");
+        String requirement = MapUtil.getStr(whereJson, "requirement");
+        String item_level = MapUtil.getStr(whereJson, "item_level");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "1");
+        map.put("item_level", item_level);
+        if (ObjectUtil.isNotEmpty(maint_item_code)) map.put("maint_item_code","%"+maint_item_code+"%");
+        if (ObjectUtil.isNotEmpty(contents)) map.put("contents","%"+contents+"%");
+        if (ObjectUtil.isNotEmpty(requirement)) map.put("requirement","%"+requirement+"%");
+
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", "");
+        }
+        JSONObject json = WQL.getWO("EM_BI_DEVICEMAINTAIN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "maint_item_code DESC");
+        return json;
+    }
+
+    @Override
+    public List<DevicemaintenanceitemsDto> queryAll(Map whereJson) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
+        JSONArray arr = wo.query().getResultJSONArray(0);
+        if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DevicemaintenanceitemsDto.class);
+        return null;
+    }
+
+    @Override
+    public DevicemaintenanceitemsDto findById(Long maint_item_id) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
+        JSONObject json = wo.query("maint_item_id = '" + maint_item_id + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)) {
+            return json.toJavaObject(DevicemaintenanceitemsDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    public DevicemaintenanceitemsDto findByCode(String code) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
+        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)) {
+            return json.toJavaObject(DevicemaintenanceitemsDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(JSONObject whereJson) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        JSONObject json = new JSONObject();
+        json.put("maint_item_id", IdUtil.getSnowflake(1,1).nextId());
+        json.put("maint_item_code", CodeUtil.getNewCode("MAINT_ITEM_CODE"));
+        json.put("maint_item_name", whereJson.getString("maint_item_name"));
+        json.put("material_type_id", whereJson.get("material_type_id"));
+        json.put("item_level", whereJson.getString("item_level"));
+        json.put("contents", whereJson.getString("contents"));
+        json.put("requirement", whereJson.getString("requirement"));
+        json.put("acceptancecriteria", whereJson.getString("acceptancecriteria"));
+        json.put("remark", whereJson.getString("remark"));
+        json.put("create_id", currentUserId);
+        json.put("create_name", nickName);
+        json.put("create_time", now);
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
+        wo.insert(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(JSONObject whereJson) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
+        JSONObject json = wo.query("maint_item_id = '" + whereJson.getString("maint_item_id") + "'").uniqueResult(0);
+
+        json.put("maint_item_name", whereJson.getString("maint_item_name"));
+        json.put("material_type_id", whereJson.get("material_type_id"));
+        json.put("item_level", whereJson.getString("item_level"));
+        json.put("contents", whereJson.getString("contents"));
+        json.put("requirement", whereJson.getString("requirement"));
+        json.put("acceptancecriteria", whereJson.getString("acceptancecriteria"));
+        json.put("remark", whereJson.getString("remark"));
+        json.put("update_optid", currentUserId);
+        json.put("update_optname", nickName);
+        json.put("update_time", now);
+
+        wo.update(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(Long[] ids) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
+        for (Long maint_item_id : ids) {
+            JSONObject param = new JSONObject();
+            param.put("maint_item_id", String.valueOf(maint_item_id));
+            param.put("is_delete", "1");
+            param.put("update_optid", currentUserId);
+            param.put("update_optname", nickName);
+            param.put("update_time", now);
+            wo.update(param);
+        }
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicerepairitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicerepairitemsServiceImpl.java
new file mode 100644
index 00000000..c0309751
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicerepairitemsServiceImpl.java
@@ -0,0 +1,160 @@
+
+package org.nl.wms.masterdata_manage.em.service.impl;
+
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.masterdata_manage.em.service.DevicerepairitemsService;
+import org.nl.wms.masterdata_manage.em.service.dto.DevicerepairitemsDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Liuxy
+ * @description 服务实现
+ * @date 2022-06-16
+ **/
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DevicerepairitemsServiceImpl implements DevicerepairitemsService {
+
+    private final ClassstandardService classstandardService;
+
+    @Override
+    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+        String repair_item_code = MapUtil.getStr(whereJson, "repair_item_code");
+        String requirement = MapUtil.getStr(whereJson, "requirement");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "1");
+        if (ObjectUtil.isNotEmpty(repair_item_code)) map.put("repair_item_code","%"+repair_item_code+"%");
+        if (ObjectUtil.isNotEmpty(requirement)) map.put("requirement","%"+requirement+"%");
+
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", "");
+        }
+
+        JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRITEMS_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "repair_item_code DESC");
+        return json;
+    }
+
+    @Override
+    public List<DevicerepairitemsDto> queryAll(Map whereJson) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
+        JSONArray arr = wo.query().getResultJSONArray(0);
+        if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DevicerepairitemsDto.class);
+        return null;
+    }
+
+    @Override
+    public DevicerepairitemsDto findById(Long repair_item_id) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
+        JSONObject json = wo.query("repair_item_id = '" + repair_item_id + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)) {
+            return json.toJavaObject(DevicerepairitemsDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    public DevicerepairitemsDto findByCode(String code) {
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
+        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(json)) {
+            return json.toJavaObject(DevicerepairitemsDto.class);
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(JSONObject whereJson) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        JSONObject json = new JSONObject();
+        json.put("repair_item_id", IdUtil.getSnowflake(1,1).nextId());
+        json.put("repair_item_code", CodeUtil.getNewCode("REPAIR_ITEM_CODE"));
+        json.put("repair_item_name", whereJson.getString("repair_item_name"));
+        json.put("material_type_id", whereJson.get("material_type_id"));
+        json.put("requirement", whereJson.getString("requirement"));
+        json.put("remark", whereJson.getString("remark"));
+        json.put("create_id",currentUserId );
+        json.put("create_name",nickName );
+        json.put("create_time",now );
+        json.put("update_optid",currentUserId );
+        json.put("update_optname",nickName );
+        json.put("update_time",now );
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
+        wo.insert(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(JSONObject whereJson) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
+        JSONObject json = wo.query("repair_item_id = '" + whereJson.getString("repair_item_id") + "'").uniqueResult(0);
+
+        json.put("repair_item_name", whereJson.getString("repair_item_name"));
+        json.put("material_type_id", whereJson.get("material_type_id"));
+        json.put("requirement", whereJson.getString("requirement"));
+        json.put("remark", whereJson.getString("remark"));
+        json.put("update_optid",currentUserId );
+        json.put("update_optname",nickName );
+        json.put("update_time",now );
+        wo.update(json);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(Long[] ids) {
+        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
+        for (Long repair_item_id : ids) {
+            JSONObject param = new JSONObject();
+            param.put("repair_item_id", String.valueOf(repair_item_id));
+            param.put("is_delete", "1");
+            param.put("update_optid", currentUserId);
+            param.put("update_optname", nickName);
+            param.put("update_time", now);
+            wo.update(param);
+        }
+    }
+
+}
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
new file mode 100644
index 00000000..f4ba9e56
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql
@@ -0,0 +1,67 @@
+[交易说明]
+	交易名：	设备故障分类维护分页查询
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.classIds					    TYPEAS f_string
+	输入.device_faultclass_code		    TYPEAS s_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+            	mst.*,
+            	class.class_name
+            FROM
+            	EM_BI_DeviceFaultClass mst
+            	LEFT JOIN md_pb_classstandard class ON mst.material_type_id = class.class_id
+            WHERE
+                mst.is_delete = '0'
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.device_faultclass_code <> ""
+                    (mst.device_faultclass_code like 输入.device_faultclass_code or
+                     mst.device_faultclass_name like 输入.device_faultclass_code)
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEMAINTAIN_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEMAINTAIN_01.wql
new file mode 100644
index 00000000..e27b22bf
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEMAINTAIN_01.wql
@@ -0,0 +1,82 @@
+[交易说明]
+	交易名：	设备保养项目维护分页查询
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.maint_item_code		            TYPEAS s_string
+	输入.contents		                TYPEAS s_string
+	输入.requirement		                TYPEAS s_string
+	输入.item_level		                TYPEAS s_string
+	输入.classIds		                TYPEAS f_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+            	item.*,
+            	class.class_name
+            FROM
+            	EM_BI_DeviceMaintenanceItems item
+            	LEFT JOIN md_pb_classstandard class ON item.material_type_id = class.class_id
+            WHERE
+                item.is_delete = '0'
+
+                OPTION 输入.item_level <> ""
+                    item.item_level = 输入.item_level
+                ENDOPTION
+
+                OPTION 输入.maint_item_code <> ""
+                    (item.maint_item_code like 输入.maint_item_code or
+                     item.maint_item_name like 输入.maint_item_code)
+                ENDOPTION
+
+                OPTION 输入.contents <> ""
+                    item.contents like 输入.contents
+                ENDOPTION
+
+                OPTION 输入.requirement <> ""
+                    item.requirement like 输入.requirement
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEREPAIRITEMS_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEREPAIRITEMS_01.wql
new file mode 100644
index 00000000..dc1f7599
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEREPAIRITEMS_01.wql
@@ -0,0 +1,72 @@
+[交易说明]
+	交易名：	设备维修项目维护分页查询
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.repair_item_code		        TYPEAS s_string
+	输入.requirement		                TYPEAS s_string
+	输入.classIds		                TYPEAS f_string
+
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+            	item.*,
+            	class.class_name
+            FROM
+            	EM_BI_DeviceRepairItems item
+            	LEFT JOIN md_pb_classstandard class ON item.material_type_id = class.class_id
+            WHERE
+                item.is_delete = '0'
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.requirement <> ""
+                    item.requirement like 输入.requirement
+                ENDOPTION
+
+                OPTION 输入.repair_item_code <> ""
+                    (item.repair_item_code like 输入.repair_item_code or
+                     item.repair_item_name like 输入.repair_item_code)
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+
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
new file mode 100644
index 00000000..39168f38
Binary files /dev/null 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/devicefaultclass.js b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass.js
new file mode 100644
index 00000000..ff92cc7e
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/devicefaultclass',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/devicefaultclass/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/devicefaultclass',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
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
new file mode 100644
index 00000000..8d787805
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊搜索">
+            <el-input
+              v-model="query.device_faultclass_code"
+              clearable
+              size="mini"
+              placeholder="请输入编码或者名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+          <el-row>
+            <el-col span="12">
+              <el-form-item label="故障编码:" prop="device_faultclass_code">
+                <el-input v-model.trim="form.device_faultclass_code" style="width: 280px;" disabled placeholder="系统生成" />
+              </el-form-item>
+            </el-col>
+            <el-col span="12">
+              <el-form-item label="故障名称:" prop="device_faultclass_name">
+                <el-input v-model.trim="form.device_faultclass_name" style="width: 280px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="设备分类:" prop="material_type_id">
+                <treeselect
+                  v-model="form.material_type_id"
+                  :load-options="loadClass"
+                  :options="classes"
+                  style="width: 280px;"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="解决措施:" prop="solutions">
+                <el-input v-model.trim="form.solutions" style="width: 650px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="备注:" prop="remark">
+                <el-input v-model.trim="form.remark" style="width: 650px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="device_faultclass_id" label="设备故障分类标识" />
+        <el-table-column prop="class_name" label="设备类别" />
+        <el-table-column prop="device_faultclass_code" label="设备故障分类编码" />
+        <el-table-column prop="device_faultclass_name" label="设备故障分类名称" />
+        <el-table-column prop="solutions" label="解决措施" />
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDevicefaultclass from '@/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+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 {
+  name: 'Devicefaultclass',
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '设备故障分类维护',
+      url: 'api/devicefaultclass',
+      idField: 'device_faultclass_id',
+      sort: 'device_faultclass_id,desc',
+      crudMethod: { ...crudDevicefaultclass },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }})
+  },
+  data() {
+    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      materOpt_code_2: '26',
+      classBj_id: null,
+      permission: {
+      },
+      rules: {
+        device_faultclass_name: [
+          { required: true, message: '故障名称不能为空', trigger: 'blur' }
+        ],
+        material_type_id: [
+          { required: true, message: '设备分类不能为空', trigger: 'blur' }
+        ],
+        solutions: [
+          { required: true, message: '解决措施不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      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 => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          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
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep {
+
+.vue-treeselect__menu {
+
+  overflow-x: auto !important;
+
+  width: 300px;
+
+  max-height: 300px !important;
+
+}
+
+.vue-treeselect__label {
+
+  overflow: unset;
+
+  text-overflow: unset;
+
+}
+
+.vue-treeselect__control {
+
+  height: 20px !important;
+
+}
+
+.vue-treeselect__multi-value-item-container,
+
+.vue-treeselect--has-value .vue-treeselect__multi-value {
+
+  height: 30px;
+
+  line-height: 24px;
+
+  padding: 0;
+
+}
+
+.vue-treeselect__limit-tip,
+
+.vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
+
+.vue-treeselect__input-container {
+
+  padding-top: 0;
+
+}
+
+.vue-treeselect--has-value .vue-treeselect__multi-value {
+
+// margin-bottom: 15px;
+
+}
+
+.vue-treeselect__placeholder,
+
+.vue-treeselect__single-value {
+
+  height: 28px;
+
+  line-height: 32px;
+
+  font-size: small;
+
+  color: "#CCCFD6";
+
+}
+
+.vue-treeselect--has-value .vue-treeselect__input {
+
+  height: 18px !important;
+
+  line-height: 18px !important;
+
+}
+
+.vue-treeselect div,
+
+.vue-treeselect span {
+
+  box-sizing: content-box;
+
+}
+
+// 选中后的溢出隐藏
+
+   .vue-treeselect__multi-value-label {
+
+     display: block;
+
+     width: 140px;
+
+     overflow: hidden;
+
+     white-space: nowrap;
+
+     text-overflow: ellipsis;
+
+   }
+
+.vue-treeselect__value-container {
+
+  display: block;
+
+  height: 32px;
+
+}
+
+}
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/devicemaintenanceitems.js b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/devicemaintenanceitems.js
new file mode 100644
index 00000000..c93a4e1b
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/devicemaintenanceitems.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/devicemaintenanceitems',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/devicemaintenanceitems/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/devicemaintenanceitems',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue
new file mode 100644
index 00000000..8d1a0a6f
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue
@@ -0,0 +1,436 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <el-form-item label="保养项目">
+            <el-input
+              v-model="query.maint_item_code"
+              clearable
+              size="mini"
+              placeholder="请输入编码或者名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="保养内容">
+            <el-input
+              v-model="query.contents"
+              clearable
+              size="mini"
+              placeholder="请输入内容"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="保养要求">
+            <el-input
+              v-model="query.requirement"
+              clearable
+              size="mini"
+              placeholder="请输入要求"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="保养等级">
+            <el-select v-model="query.item_level" clearable placeholder="请选择" @change="changeQuery">
+              <el-option
+                v-for="item in itemLevelList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="850px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
+          <el-row>
+            <el-col span="12">
+              <el-form-item label="保养项目编码:">
+                <el-input v-model.trim="form.maint_item_code" style="width: 230px;" disabled placeholder="系统生成" />
+              </el-form-item>
+            </el-col>
+            <el-col span="12">
+              <el-form-item label="保养项目名称:" prop="maint_item_name">
+                <el-input v-model.trim="form.maint_item_name" style="width: 230px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="12">
+              <el-form-item label="保养等级:" prop="item_level">
+                <el-select v-model="form.item_level" clearable placeholder="请选择" style="width: 230px">
+                  <el-option
+                    v-for="item in itemLevelList"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col span="12">
+              <el-form-item label="保养实施人:">
+                <el-input v-model.trim="form.remark" style="width: 230px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="设备类别:" prop="material_type_id">
+                <treeselect
+                  v-model="form.material_type_id"
+                  :load-options="loadClass"
+                  :options="classes"
+                  style="width: 230px;"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="保养内容:" prop="contents">
+                <el-input v-model.trim="form.contents" style="width: 600px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="保养要求:" prop="requirement">
+                <el-input v-model.trim="form.requirement" style="width: 600px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="验收标准:" prop="acceptancecriteria">
+                <el-input v-model.trim="form.acceptancecriteria" style="width: 600px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="maint_item_id" label="设备保养项目标识" />
+        <el-table-column prop="maint_item_code" label="保养项目编码" />
+        <el-table-column prop="maint_item_name" label="保养项目名称" />
+        <el-table-column prop="class_name" label="设备类别" />
+        <el-table-column prop="item_level" label="保养等级" :formatter="formatLevel" />
+        <el-table-column prop="contents" label="保养内容" show-overflow-tooltip />
+        <el-table-column prop="requirement" label="保养要求" show-overflow-tooltip />
+        <el-table-column prop="acceptancecriteria" label="验收标准" show-overflow-tooltip />
+        <el-table-column prop="remark" label="保养实施人" />
+        <el-table-column prop="create_name" label="创建人姓名" />
+        <el-table-column prop="create_time" label="创建时间" width="150px" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDevicemaintenanceitems from '@/views/wms/masterdata_manage/em/devicemaintain/devicemaintenanceitems'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+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'
+
+const defaultForm = { material_type_id: null, maint_item_id: null, maint_item_code: null, maint_item_name: null, item_level: null, contents: null, requirement: null, acceptancecriteria: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, remark: null }
+export default {
+  name: 'Devicemaintain',
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '设备保养项目维护',
+      url: 'api/devicemaintenanceitems',
+      idField: 'maint_item_id',
+      sort: 'maint_item_id,desc',
+      crudMethod: { ...crudDevicemaintenanceitems },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }})
+  },
+  data() {
+    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      itemLevelList: [
+        { 'label': '日常', 'value': '01' },
+        { 'label': '一级', 'value': '02' },
+        { 'label': '二级', 'value': '03' }
+      ],
+      permission: {
+      },
+      rules: {
+        maint_item_name: [
+          { required: true, message: '保养项目名称不能为空', trigger: 'blur' }
+        ],
+        item_level: [
+          { required: true, message: '保养等级不能为空', trigger: 'blur' }
+        ],
+        contents: [
+          { required: true, message: '保养内容不能为空', trigger: 'blur' }
+        ],
+        requirement: [
+          { required: true, message: '保养要求不能为空', trigger: 'blur' }
+        ],
+        acceptancecriteria: [
+          { required: true, message: '验收标准不能为空', trigger: 'blur' }
+        ],
+        material_type_id: [
+          { required: true, message: '设备类别不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    [CRUD.HOOK.afterToCU](crud, form) {
+      debugger
+      if (!form.maint_item_code) {
+        this.queryClassId()
+      } else {
+        const data = {}
+        data.id = form.material_type_id
+        data.goal_id = this.classBj_id
+        this.getSubTypes(data)
+      }
+    },
+    changeQuery() {
+      this.crud.toQuery()
+    },
+    formatLevel(row, cloum) {
+      if (row.item_level === '01') {
+        return '日常'
+      } else if (row.item_level === '02') {
+        return '一级'
+      } else if (row.item_level === '03') {
+        return '二级'
+      }
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          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
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep {
+
+.vue-treeselect__menu {
+
+  overflow-x: auto !important;
+
+  width: 300px;
+
+  max-height: 300px !important;
+
+}
+
+.vue-treeselect__label {
+
+  overflow: unset;
+
+  text-overflow: unset;
+
+}
+
+.vue-treeselect__control {
+
+  height: 20px !important;
+
+}
+
+.vue-treeselect__multi-value-item-container,
+
+.vue-treeselect--has-value .vue-treeselect__multi-value {
+
+  height: 30px;
+
+  line-height: 24px;
+
+  padding: 0;
+
+}
+
+.vue-treeselect__limit-tip,
+
+.vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
+
+.vue-treeselect__input-container {
+
+  padding-top: 0;
+
+}
+
+.vue-treeselect--has-value .vue-treeselect__multi-value {
+
+// margin-bottom: 15px;
+
+}
+
+.vue-treeselect__placeholder,
+
+.vue-treeselect__single-value {
+
+  height: 28px;
+
+  line-height: 32px;
+
+  font-size: small;
+
+  color: "#CCCFD6";
+
+}
+
+.vue-treeselect--has-value .vue-treeselect__input {
+
+  height: 18px !important;
+
+  line-height: 18px !important;
+
+}
+
+.vue-treeselect div,
+
+.vue-treeselect span {
+
+  box-sizing: content-box;
+
+}
+
+// 选中后的溢出隐藏
+
+   .vue-treeselect__multi-value-label {
+
+     display: block;
+
+     width: 140px;
+
+     overflow: hidden;
+
+     white-space: nowrap;
+
+     text-overflow: ellipsis;
+
+   }
+
+.vue-treeselect__value-container {
+
+  display: block;
+
+  height: 32px;
+
+}
+
+}
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems.js b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems.js
new file mode 100644
index 00000000..9666d5d3
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/devicerepairitems',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/devicerepairitems/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/devicerepairitems',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue
new file mode 100644
index 00000000..ecea78cf
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue
@@ -0,0 +1,361 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <el-form-item label="维修项目">
+            <el-input
+              v-model="query.repair_item_code"
+              clearable
+              size="mini"
+              placeholder="请输入编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="维修要求">
+            <el-input
+              v-model="query.requirement"
+              clearable
+              size="mini"
+              placeholder="请输入要求"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="750px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
+          <el-row>
+            <el-col span="12">
+              <el-form-item label="维修项目编码:">
+                <el-input v-model.trim="form.repair_item_code" style="width: 200px;" disabled placeholder="系统生成" />
+              </el-form-item>
+            </el-col>
+            <el-col span="12">
+              <el-form-item label="维修项目名称:" prop="repair_item_name">
+                <el-input v-model.trim="form.repair_item_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="设备类别:" prop="material_type_id">
+                <treeselect
+                  v-model="form.material_type_id"
+                  :load-options="loadClass"
+                  :options="classes"
+                  style="width: 200px;"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="维修要求:" prop="requirement">
+                <el-input v-model.trim="form.requirement" style="width: 555px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="备注:">
+                <el-input v-model.trim="form.remark" style="width: 555px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="repair_item_id" label="设备维修项目标识" />
+        <el-table-column prop="repair_item_code" label="维修项目编码" />
+        <el-table-column prop="repair_item_name" label="维修项目名称" />
+        <el-table-column prop="class_name" label="设备类别" />
+        <el-table-column prop="requirement" label="维修要求" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+        <el-table-column prop="create_name" label="创建人姓名" />
+        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDevicerepairitems from '@/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+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'
+
+const defaultForm = { material_type_id: null, repair_item_id: null, repair_item_code: null, repair_item_name: null, requirement: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, remark: null }
+export default {
+  name: 'Devicerepairitems',
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '设备维修项目维护',
+      url: 'api/devicerepairitems',
+      idField: 'repair_item_id',
+      sort: 'repair_item_id,desc',
+      crudMethod: { ...crudDevicerepairitems },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }})
+  },
+  data() {
+    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      permission: {
+      },
+      rules: {
+        repair_item_name: [
+          { required: true, message: '设备维修项目名称不能为空', trigger: 'blur' }
+        ],
+        requirement: [
+          { required: true, message: '维修要求不能为空', trigger: 'blur' }
+        ],
+        material_type_id: [
+          { required: true, message: '设备类别不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    [CRUD.HOOK.afterToCU](crud, form) {
+      if (!form.repair_item_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 => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          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
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep {
+
+.vue-treeselect__menu {
+
+  overflow-x: auto !important;
+
+  width: 300px;
+
+  max-height: 300px !important;
+
+}
+
+.vue-treeselect__label {
+
+  overflow: unset;
+
+  text-overflow: unset;
+
+}
+
+.vue-treeselect__control {
+
+  height: 20px !important;
+
+}
+
+.vue-treeselect__multi-value-item-container,
+
+.vue-treeselect--has-value .vue-treeselect__multi-value {
+
+  height: 30px;
+
+  line-height: 24px;
+
+  padding: 0;
+
+}
+
+.vue-treeselect__limit-tip,
+
+.vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
+
+.vue-treeselect__input-container {
+
+  padding-top: 0;
+
+}
+
+.vue-treeselect--has-value .vue-treeselect__multi-value {
+
+// margin-bottom: 15px;
+
+}
+
+.vue-treeselect__placeholder,
+
+.vue-treeselect__single-value {
+
+  height: 28px;
+
+  line-height: 32px;
+
+  font-size: small;
+
+  color: "#CCCFD6";
+
+}
+
+.vue-treeselect--has-value .vue-treeselect__input {
+
+  height: 18px !important;
+
+  line-height: 18px !important;
+
+}
+
+.vue-treeselect div,
+
+.vue-treeselect span {
+
+  box-sizing: content-box;
+
+}
+
+// 选中后的溢出隐藏
+
+   .vue-treeselect__multi-value-label {
+
+     display: block;
+
+     width: 140px;
+
+     overflow: hidden;
+
+     white-space: nowrap;
+
+     text-overflow: ellipsis;
+
+   }
+
+.vue-treeselect__value-container {
+
+  display: block;
+
+  height: 32px;
+
+}
+
+}
+</style>