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 4c8aa0495..49396997f 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 @@ -455,7 +455,11 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { if(sonMesReport == null){//单层工单的情况 sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto); } - + //三层订单 + QuantityDto quantityDtothree = new QuantityDto(); + quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode()); + quantityDtothree.setMachineCode(machineCode); + QuantityDto threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree); // 产量 Long sumQua = 0L; // 实际产量 @@ -469,6 +473,10 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { realQua = parentMesReport.getQuantityFeedbackSum(); workTime = sonMesReport.getWorkTime(); useMan = sonMesReport.getUseMan().add(parentMesReport.getUseMan()); + // 若 threeMesReport 不为空,则叠加其 useMan 值 + if (threeMesReport != null && threeMesReport.getUseMan() != null) { + useMan = useMan.add(threeMesReport.getUseMan()); + } dto.setQuantityAct(String.valueOf(sumQua)); dto.setQuantityFeedback(String.valueOf(realQua)); dto.setWorkTime(workTime); 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 1f7be2ec3..342ae6fc8 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 @@ -863,6 +863,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"