diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls
index da1db16a..03543cfe 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
index b1e6c58f..034599c9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
@@ -48,6 +48,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String repair_type = MapUtil.getStr(whereJson, "repair_type");
         String device_code = MapUtil.getStr(whereJson, "device_code");
         String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
         String repair_plan_code = MapUtil.getStr(whereJson, "repair_plan_code");
@@ -62,6 +63,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
         map.put("is_active", is_active);
         map.put("begin_time", begin_time);
         map.put("end_time", end_time);
+        map.put("repair_type", repair_type);
         if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
         if (ObjectUtil.isNotEmpty(repair_plan_code)) map.put("repair_plan_code","%"+repair_plan_code+"%");
         //处理物料当前节点的所有子节点
@@ -128,6 +130,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
         jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
         jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
         jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
+        jsonMst.put("repair_type",whereJson.getString("repair_type"));
         jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
         jsonMst.put("detail_count",tableData.size());
         jsonMst.put("create_id",currentUserId);
@@ -169,6 +172,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
         jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
         jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
         jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
+        jsonMst.put("repair_type",whereJson.getString("repair_type"));
         jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
         jsonMst.put("detail_count",tableData.size());
         jsonMst.put("update_optid",currentUserId);
@@ -268,6 +272,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
         jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
         jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
         jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
+        jsonMst.put("repair_type",whereJson.getString("repair_type"));
         jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
         jsonMst.put("detail_count",tableData.size());
         jsonMst.put("create_id",currentUserId);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
index 8ed59224..ef8405ca 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
@@ -22,6 +22,7 @@
 	输入.is_active					    TYPEAS s_string
 	输入.begin_time					    TYPEAS s_string
 	输入.end_time					    TYPEAS s_string
+	输入.repair_type					    TYPEAS s_string
 
 
 [临时表]
@@ -80,6 +81,10 @@
                     mst.maintenancecycle = 输入.maintenancecycle
                 ENDOPTION
 
+                OPTION 输入.repair_type <> ""
+                    mst.repair_type = 输入.repair_type
+                ENDOPTION
+
                 OPTION 输入.is_active <> ""
                     mst.is_active = 输入.is_active
                 ENDOPTION
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue
index dd4c6d03..c94064eb 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue
@@ -65,7 +65,25 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="18">
+        <el-col :span="6">
+          <el-form-item label="维修类型" prop="repair_type">
+            <el-select
+              v-model="form.repair_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_WX_TYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
           </el-form-item>
@@ -144,7 +162,7 @@ import CRUD, { form, crud } from '@crud/crud'
 
 export default {
   name: 'AddDialog',
-  dicts: ['EM_DEVICE_WX_CYCLE'],
+  dicts: ['EM_DEVICE_WX_CYCLE', 'EM_DEVICE_WX_TYPE'],
   components: { ItemDialog, DeviceDialog },
   mixins: [form(defaultForm), crud()],
   props: {
@@ -180,6 +198,9 @@ export default {
         ],
         devicerecord_id: [
           { required: true, message: '设备不能为空', trigger: 'blur' }
+        ],
+        repair_type: [
+          { required: true, message: '维修类型不能为空', trigger: 'blur' }
         ]
       }
     }
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue
index 1d129080..cc4bd320 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue
@@ -68,7 +68,25 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="18">
+        <el-col :span="6">
+          <el-form-item label="维修类型" prop="repair_type">
+            <el-select
+              v-model="form1.repair_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_WX_TYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form1.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
           </el-form-item>
@@ -137,7 +155,7 @@ import CRUD, { crud } from '@crud/crud'
 
 export default {
   name: 'AddDialog',
-  dicts: ['EM_DEVICE_WX_CYCLE'],
+  dicts: ['EM_DEVICE_WX_CYCLE', 'EM_DEVICE_WX_TYPE'],
   components: { ItemDialog, DeviceDialog },
   mixins: [crud()],
   props: {
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
index e61067b4..1443dfe2 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
@@ -73,6 +73,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="维修类型">
+            <el-select
+              v-model="query.repair_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 200px"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_WX_TYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -111,6 +128,7 @@
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
         <el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" />
+        <el-table-column prop="repair_type" label="维修类型" :formatter="formatRepairpType" />
         <el-table-column prop="plan_start_date" label="计划开始日期" width="120px" />
         <el-table-column prop="real_start_date" label="实际开始日期" width="120px" />
         <el-table-column prop="real_end_date" label="实际结束日期" width="120px" />
@@ -153,7 +171,7 @@ import CopyAddDialog from '@/views/wms/sb/repair/devicerepairplan/CopyAddDialog'
 
 export default {
   name: 'Devicerepairplanmst',
-  dicts: ['EM_DEVICE_WX_CYCLE', 'IS_OR_NOT'],
+  dicts: ['EM_DEVICE_WX_CYCLE', 'IS_OR_NOT', 'EM_DEVICE_WX_TYPE'],
   components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, CopyAddDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -228,6 +246,9 @@ export default {
     formatMainName(row, cloum) {
       return this.dict.label.EM_DEVICE_WX_CYCLE[row.maintenancecycle]
     },
+    formatRepairpType(row, cloum) {
+      return this.dict.label.EM_DEVICE_WX_TYPE[row.repair_type]
+    },
     loadClass({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
         crudClassstandard.getClass({ pid: parentNode.id }).then(res => {