change(mes):工时报表使用计划编号字段(plan_code)

- 将派工单字段(dispatch_code)更正为计划编号字段(plan_code)
- 更新实体WorkHourReportVo类中的字段注释和Excel导出属性
-保持查询逻辑与实际业务字段一致
master
zangch@mesnac.com 2 months ago
parent cf03304e57
commit 1d77494d9d

@ -22,10 +22,10 @@ public class WorkHourReportVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* * 使planCode
*/ */
@ExcelProperty(value = "派工单") @ExcelProperty(value = "编号")
private String dispatchCode; private String planCode;
/** /**
* *
@ -87,4 +87,4 @@ public class WorkHourReportVo implements Serializable {
@ExcelProperty(value = "备注") @ExcelProperty(value = "备注")
private String remark; private String remark;
} }

@ -229,7 +229,7 @@
AND ppd.class_team_id = #{map.classTeamId} AND ppd.class_team_id = #{map.classTeamId}
</if> </if>
<if test="map.planCode != null and map.planCode != ''"> <if test="map.planCode != null and map.planCode != ''">
AND ppi.dispatch_code LIKE CONCAT('%', #{map.planCode}, '%') AND ppi.plan_code LIKE CONCAT('%', #{map.planCode}, '%')
</if> </if>
<if test="map.materialName != null and map.materialName != ''"> <if test="map.materialName != null and map.materialName != ''">
AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%') AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')
@ -243,7 +243,7 @@
<select id="workHourReportList" resultType="org.dromara.mes.domain.vo.WorkHourReportVo"> <select id="workHourReportList" resultType="org.dromara.mes.domain.vo.WorkHourReportVo">
SELECT SELECT
ppi.dispatch_code AS dispatchCode, ppi.plan_code AS planCode,
bct.team_name AS teamName, bct.team_name AS teamName,
pbsi.station_name AS stationName, pbsi.station_name AS stationName,
bmi.material_name AS materialName, bmi.material_name AS materialName,
@ -286,7 +286,7 @@
AND ppd.class_team_id = #{map.classTeamId} AND ppd.class_team_id = #{map.classTeamId}
</if> </if>
<if test="map.planCode != null and map.planCode != ''"> <if test="map.planCode != null and map.planCode != ''">
AND ppi.dispatch_code LIKE CONCAT('%', #{map.planCode}, '%') AND ppi.plan_code LIKE CONCAT('%', #{map.planCode}, '%')
</if> </if>
<if test="map.materialName != null and map.materialName != ''"> <if test="map.materialName != null and map.materialName != ''">
AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%') AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')

Loading…
Cancel
Save