diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java index 18952535..54f86cf6 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/WorkHourReportVo.java @@ -22,10 +22,10 @@ public class WorkHourReportVo implements Serializable { private static final long serialVersionUID = 1L; /** - * 派工单 + * 使用计划编号planCode展示 */ - @ExcelProperty(value = "派工单") - private String dispatchCode; + @ExcelProperty(value = "编号") + private String planCode; /** * 班组 @@ -87,4 +87,4 @@ public class WorkHourReportVo implements Serializable { @ExcelProperty(value = "备注") private String remark; -} \ No newline at end of file +} diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml index 59042678..b8759321 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml @@ -229,7 +229,7 @@ AND ppd.class_team_id = #{map.classTeamId} - AND ppi.dispatch_code LIKE CONCAT('%', #{map.planCode}, '%') + AND ppi.plan_code LIKE CONCAT('%', #{map.planCode}, '%') AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%') @@ -243,7 +243,7 @@