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 90b011a6..aff4466a 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/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
index d4eca4b0..ec25b8f7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
@@ -293,6 +293,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         // 1. 更新设备维修单主表
         JSONObject jsonReMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
         jsonReMst.put("invstatus", "03");
+        jsonReMst.put("estimaterepair_times", whereJson.getString("estimaterepair_times"));
         jsonReMst.put("update_optname", whereJson.getString("update_optname"));
         jsonReMst.put("real_start_date", DateUtil.now());
         reMstTab.update(jsonReMst);
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue
index a1e38ae6..4c101444 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue
@@ -16,6 +16,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="预计修复时间" prop="estimaterepair_times">
+            <el-input-number v-model="form4.estimaterepair_times" :precision="1" :min="0" :max="999" style="width: 200px" :controls="false"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <span slot="footer" class="dialog-footer">
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
index 549c781b..358b060f 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -155,6 +155,7 @@
         <el-table-column prop="update_optname" label="维修人"  min-width="150" />
         <el-table-column prop="real_start_date" label="开始时间" min-width="140"  />
         <el-table-column prop="real_end_date" label="结束时间" min-width="140"  />
+        <el-table-column prop="estimaterepair_times" label="预计修复时间" min-width="130"  />
         <el-table-column prop="confirm_optname" label="验收人" min-width="90" />
         <el-table-column prop="confirm_time" label="验收时间" min-width="140"  />
         <el-table-column prop="audit_optname" label="审核人" min-width="90" />