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 7a991c653..399fdb7cd 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 @@ -107,6 +107,15 @@ public class MesDailyReportVo extends BaseEntity { private String reason; private String machineCode; private BigDecimal reportRate; + private String useManRemark; + + public String getUseManRemark() { + return useManRemark; + } + + public void setUseManRemark(String useManRemark) { + this.useManRemark = useManRemark; + } public String getShiftDesc() { return shiftDesc; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 3ce5e9651..a7d0e8bed 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -202,7 +202,7 @@ public interface MesReportWorkMapper { //当月产线品类汇总 List getmonthProductionSutCategory(MesMonthReportVo mesMonthReportVo); - String getProductReason(QuantityDto quantityDto); + Map getProductReason(QuantityDto quantityDto); String getTypeName(String productCode); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index e10104a91..81eda903d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -205,6 +205,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { List liblist = mesReportWorkMapper.getReportList(mesReportWork); sTabs.setLibList(liblist); sTabs.setRemark(liblist.get(0).getRemark()); + sTabs.setUseManRemark(liblist.get(0).getUseManRemark()); tabs.add(sTabs); sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(sonWorkOrder.getWorkorderCode()); @@ -450,10 +451,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { quantityDto.setWorkorderCode(workorderCode); quantityDto.setMachineCode(machineCode); - //影响效率原因 - String reasons = mesReportWorkMapper.getProductReason(quantityDto); - if(StringUtils.isNotBlank(reasons)){ - dto.setReason(reasons.replaceAll(";+", " ")); + //影响效率原因/用人说明 + Map reasons = mesReportWorkMapper.getProductReason(quantityDto); + if((reasons != null && !reasons.isEmpty()) && + StringUtils.isNotBlank(reasons.get("Reasons").toString()) && + StringUtils.isNotBlank(reasons.get("useManRemark").toString())){ + dto.setReason(reasons.get("Reasons").toString().replaceAll(";+", " ")); + dto.setUseManRemark(reasons.get("useManRemark").toString().replaceAll(";+", " ")); } QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto); 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 224e8c053..62a82993c 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 @@ -1112,15 +1112,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT - remark AS Reasons + remark AS Reasons, + use_man_remark AS useManRemark FROM mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and Reason is not null and reason !='' and reason !='无' GROUP BY + use_man_remark, remark;