diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java index 21c77417..53138973 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java @@ -65,6 +65,11 @@ public class EqpEquipmentInspectionRecordBo extends BaseEntity { */ private String photo; + /** + * 产线 + */ + private String productionLine; + /** * 巡检时间开始 */ diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java index 3dde7ddc..9bf840bc 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java @@ -84,5 +84,15 @@ public class EqpEquipmentInspectionRecordVo { */ private String checkStandard; + /** + * 巡检部位 + */ + private String inspectPart; + + /** + * 产线 + */ + private String productionLine; + } diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java index 91c04f05..ed3601ba 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java @@ -58,6 +58,7 @@ public class EqpEquipmentInspectionRecordServiceImpl implements IEqpEquipmentIns qw.eq(bo.getRunStatus() != null, "r.run_status", bo.getRunStatus()); qw.eq(StringUtils.isNotBlank(bo.getInspector()), "r.inspector", bo.getInspector()); qw.eq(StringUtils.isNotBlank(bo.getAbnormalDesc()), "r.abnormal_desc", bo.getAbnormalDesc()); + qw.eq(StringUtils.isNotBlank(bo.getProductionLine()), "p.production_line", bo.getProductionLine()); qw.ge(bo.getStartInspectTime() != null, "r.inspect_time", bo.getStartInspectTime()); qw.le(bo.getEndInspectTime() != null, "r.inspect_time", bo.getEndInspectTime()); qw.eq("r.del_flag", 0); diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml index 59ef145f..7df6be5f 100644 --- a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml @@ -33,9 +33,12 @@ r.remark, r.photo, c.check_content AS checkContent, - c.check_standard AS checkStandard + c.check_standard AS checkStandard, + p.inspect_part AS inspectPart, + p.production_line AS productionLine FROM eqp_equipment_inspection_record r LEFT JOIN eqp_equipment_checklist c ON r.check_id = c.check_id AND c.del_flag = '0' + LEFT JOIN eqp_equipment_part p ON c.part_id = p.part_id AND p.del_flag = '0' ${ew.customSqlSegment} diff --git a/klp-ui/src/views/mes/eqp/check/day.vue b/klp-ui/src/views/mes/eqp/check/day.vue index dabb6d0e..79a6d2b1 100644 --- a/klp-ui/src/views/mes/eqp/check/day.vue +++ b/klp-ui/src/views/mes/eqp/check/day.vue @@ -2,9 +2,10 @@