diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java index fd99c991..2df11124 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java @@ -74,7 +74,7 @@ public class MesDailyReportVo extends BaseEntity { private String workorderName; private String quantity;//计划产量(箱) - @Excel(name = "实际用人") + @Excel(name = "标准用人") private String manStandard;//实际用人 @Excel(name = "标准工时") private String workTimeStandard;//工时-标准 diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 7c518b3f..6c89b5ce 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -696,7 +696,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_product bp on bp.product_code = pow.product_code where be.del_flag = '0' and be.sap_code is not null and pow.status in ('w2','w3') and pow.parent_order = '0' and pow.del_flag='0' - and be.sap_name like concat('%', #{sapName}, '%') + and be.equipment_name like concat('%', #{sapName}, '%') and be.workshop_code = #{workCenter} and be.equipment_type_code = #{equipmentTypeCode}