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 dd30bbac7..1a3c18b36 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 @@ -190,4 +190,6 @@ public interface MesReportWorkMapper { List getmonthProductionSutCategory(MesMonthReportVo mesMonthReportVo); String 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 8b31813d0..6ca63047f 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 @@ -416,7 +416,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { for (MesDailyReportVo dto : dtos) { dto.setFactoryCode(factoryCode); - dto.setProdType("蚊香"); + //品类 + String typeName = mesReportWorkMapper.getTypeName(dto.getProductCode().replace("0000000","")); + if(StringUtils.isNotBlank(typeName)){ + dto.setProdType(typeName); + }else { + dto.setProdType("蚊香"); + } QuantityDto quantityDto = new QuantityDto(); String workorderCode = dto.getWorkorderCode(); @@ -426,7 +432,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { quantityDto.setMachineCode(machineCode); //影响效率原因 String reasons = mesReportWorkMapper.getProductReason(quantityDto); - if(!reasons.equals(";;")&&StringUtils.isNotBlank(reasons)){ + if(StringUtils.isNotBlank(reasons)&&!reasons.equals(";;")){ dto.setReason(reasons); } 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 71f13f3f0..2129a115d 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 @@ -957,10 +957,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT STRING_AGG(Reason, ';') AS Reasons FROM - mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' + mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and Reason is not null GROUP BY workorder_code; + insert into mes_report_work