DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-05-29 11:15:14 +08:00
parent df643a8e4e 8684bc4a63
commit 327ae685c1
6 changed files with 143 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java
View File

@@ -65,6 +65,11 @@ public class EqpEquipmentInspectionRecordBo extends BaseEntity {
*/
private String photo;
/**
* 产线
*/
private String productionLine;
/**
* 巡检时间开始
*/

10
klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java
View File

@@ -84,5 +84,15 @@ public class EqpEquipmentInspectionRecordVo {
*/
private String checkStandard;
/**
* 巡检部位
*/
private String inspectPart;
/**
* 产线
*/
private String productionLine;
}

1
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java
View File

@@ -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);

5
klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml
View File

@@ -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}
</select>