优化

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql

@@ -273,7 +273,8 @@
                 r.fault_comment,
                 r.fault_cause,
                 r.fault_analysis,
-                r.measure
+                r.measure,
+                RepairRequest.create_name AS request_name
             FROM
             	EM_BI_DeviceRepairMst mst
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
@@ -281,11 +282,11 @@
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
                 LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
                 LEFT JOIN EM_BI_DeviceRepairRecord r ON r.repair_id = mst.repair_id
+                LEFT JOIN EM_BI_DeviceRepairRequest RepairRequest ON RepairRequest.request_id = mst.source_bill_id
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
                 AND mst.invstatus not in ('04','06','99')
-
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
                     file.device_name like 输入.device_code)

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

@@ -47,6 +47,9 @@
           <el-table-column min-width="80" prop="material_name" label="物料名称" align="center" />
           <el-table-column min-width="80" prop="class_code" label="分类编码" align="center" />
           <el-table-column min-width="120" prop="class_name" label="分类名称" align="center" />
+          <el-table-column prop="last_change" label="上次更换时间" width="120px" />
+          <el-table-column prop="current_change" label="本次更换时间" width="120px" />
+          <el-table-column prop="interval_time" label="更换间隔" width="120px" />
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="文档管理" name="second">

mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue

@@ -149,14 +149,15 @@
         <el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/>
         <el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip />
         <el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip />
+        <el-table-column prop="request_name" label="报修人" />
         <el-table-column prop="remark" label="备注" show-overflow-tooltip />
         <el-table-column prop="input_optname" label="制单人" />
         <el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="update_optname" label="维修人" show-overflow-tooltip />
         <el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip />
-        <el-table-column prop="confirm_optname" label="确认人" />
+        <el-table-column prop="confirm_optname" label="验收人" />
-        <el-table-column prop="confirm_time" label="确认时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="confirm_time" label="验收时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="audit_optname" label="审核人" />
         <el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip />