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
index 330cfedf..4041c833 100644
--- 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
@@ -7,12 +7,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.anno.Log;
+import org.nl.common.utils.RedissonUtils;
 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 org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -54,4 +58,14 @@ public class DevicerepairitemsController {
         devicerepairitemsService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    /**
+     * 导入bom数据
+     */
+    @Log("导入维修项")
+    @PostMapping("/excelImport")
+    public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+        RedissonUtils.lock(() -> devicerepairitemsService.excelImport(file, request), "导入设备档案", null);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
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
index 06e776b3..e92d7fff 100644
--- 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
@@ -4,7 +4,9 @@ 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 org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -69,4 +71,11 @@ public interface DevicerepairitemsService {
      * @param ids /
      */
     void deleteAll(Long[] ids);
+
+    /**
+     * 导入维修项目
+     * @param file
+     * @param request
+     */
+    void excelImport(MultipartFile file, HttpServletRequest request);
 }
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
index eef4dbba..0f05917b 100644
--- 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
@@ -7,25 +7,34 @@ 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 cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
 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.common.exception.BadRequestException;
 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.SpringContextHolder;
 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.bfmaster.service.ClassstandardService;
+import org.nl.wms.system_manage.service.tableData.ColumnInfoService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Liuxy
@@ -157,4 +166,55 @@ public class DevicerepairitemsServiceImpl implements DevicerepairitemsService {
         }
     }
 
+
+    @Override
+    @Transactional
+    public void excelImport(MultipartFile file, HttpServletRequest request) {
+        try {
+            // 调用用 hutool 方法读取数据 调用第一个sheet白班数据
+            ExcelReader excelReader = ExcelUtil.getReader(file.getInputStream(), 0);
+            // 从第1行开始获取数据   excelReader.read的结果是一个2纬的list，外层是行，内层是行对应的所有列
+            ColumnInfoService columnInfoService = SpringContextHolder.getBean(ColumnInfoService.class);
+            Map<String, String> tableColumn = columnInfoService.TableColumn2("em_bi_devicerepairitems");
+            List<List<Object>> read = excelReader.read(0, excelReader.getRowCount());
+            Map<Integer, String> IndexValue = new HashMap<>();
+            for (int i = 0; i < read.get(0).size(); i++) {
+                String label = String.valueOf(read.get(0).get(i));
+                String value = tableColumn.get(label);
+                if (value != null) {
+                    IndexValue.put(i, value);
+                }
+            }
+            String currentUserId = SecurityUtils.getCurrentUserId();
+            String currentUsername = SecurityUtils.getCurrentUsername();
+            String now = DateUtil.now();
+            JSONArray array = new JSONArray();
+            List<String> ids = new ArrayList<>();
+            for (int i = 1; i < read.size(); i++) {
+                List<Object> list = read.get(i);
+                JSONObject item = new JSONObject();
+                for (int i1 = 0; i1 < list.size(); i1++) {
+                    String s = IndexValue.get(i1);
+                    if (s != null) {
+                        item.put(s, list.get(i1));
+
+                    }
+                }
+                item.put("create_id", currentUserId);
+                item.put("create_name", currentUsername);
+                item.put("create_time", now);
+                array.add(item);
+                ids.add(item.getString("repair_item_id"));
+            }
+            System.out.println(array.size());
+            WQLObject mstTab = WQLObject.getWQLObject("em_bi_devicerepairitems"); // 工艺路线主表
+            mstTab.delete("repair_item_id in " + "('" + ids.stream().collect(Collectors.joining("','")) + "')");
+            for (Object o : array) {
+                mstTab.insert((JSONObject) o);
+            }
+        } catch (Exception ex) {
+            throw new BadRequestException(ex.getMessage());
+        }
+    }
+
 }
diff --git a/mes/qd/src/views/wms/analysis_manage/qlmanage/index.vue b/mes/qd/src/views/wms/analysis_manage/qlmanage/index.vue
index 0cc48bdb..96c6898d 100644
--- a/mes/qd/src/views/wms/analysis_manage/qlmanage/index.vue
+++ b/mes/qd/src/views/wms/analysis_manage/qlmanage/index.vue
@@ -36,15 +36,6 @@
               :default-time="['00:00:00','23:59:59']"
             />
           </el-form-item>
-          <el-form-item label="设备编号">
-            <el-input
-              v-model="query.device_code"
-              clearable
-              size="mini"
-              placeholder="物料编码,规格"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="所属工序">
             <el-select v-model="query.workprocedure_id" class="filter-item" clearable filterable placeholder="所属工序" size="small" style="width: 280px">
               <el-option
@@ -55,6 +46,14 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="统计类型">
+            <el-radio v-model="radioValue" :label="4">
+              指定
+              <el-select v-model="checkboxList" clearable placeholder="可多选" multiple style="width:100%">
+                <el-option v-for="item in 60" :key="item" :value="item-1">{{ item-1 }}</el-option>
+              </el-select>
+            </el-radio>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/UploadDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/UploadDialog.vue
new file mode 100644
index 00000000..c1b32f7f
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/UploadDialog.vue
@@ -0,0 +1,121 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import devicerepairitems from '@/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems'
+import CRUD, { crud } from '@crud/crud'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        devicerepairitems.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        }).catch(err => {
+          // const list = err.response.data.message
+          // download2('/api/produceWorkorder/download', list).then(result => {
+          //   downloadFile(result, '错误信息汇总', 'xlsx')
+          //   crud.downloadLoading = false
+          // })
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+
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
index 9666d5d3..1e98f0f8 100644
--- a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems.js
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/devicerepairitems.js
@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function excelImport(data) {
+  return request({
+    url: 'api/devicerepairitems/excelImport',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, excelImport }
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
index 49377fb3..067588d2 100644
--- a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue
@@ -42,7 +42,18 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission" >
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadShow = true"
+        >
+          导入
+        </el-button>
+      </crudOperation>
       <!--表单组件-->
       <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">
@@ -117,10 +128,12 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
   </div>
 </template>
 
 <script>
+import UploadDialog from '@/views/wms/masterdata_manage/em/devicerepairitems/UploadDialog'
 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'
@@ -135,7 +148,7 @@ 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 },
+  components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -154,6 +167,7 @@ export default {
   },
   data() {
     return {
+      uploadShow: false,
       classes: [],
       class_idStr: null,
       materOpt_code: '23',
@@ -183,6 +197,9 @@ export default {
     })
   },
   methods: {
+    tableChanged3() {
+      this.crud.toQuery()
+    },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true