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 2dc221e2..5b2c7ac0 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 @@ -183,4 +183,6 @@ public interface MesReportWorkMapper { QuantityDto getSumQuantity(QuantityDto quantityDto); List getmonthProductionSut(MesMonthReportVo mesMonthReportVo); + + QuantityDto getSumQuantityOne(QuantityDto quantityDto); } 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 b61159c8..cbc63278 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 @@ -426,6 +426,9 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { quantityDto.setMachineCode(machineCode); QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto); QuantityDto sonMesReport = mesReportWorkMapper.getSumQuantity(quantityDto); + if(sonMesReport == null){//单层工单的情况 + sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto); + } // 产量 Long sumQua = 0L; 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 4f523bee..b76e1753 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 @@ -723,6 +723,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and upload_status = '1' + + - + insert into mes_report_work id,