diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 6358c5018..a3cb852c9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -250,7 +250,7 @@ public class MesReportWorkController extends BaseController { @RequiresPermissions("mes:dailyReport:list") @GetMapping("/getDailyReportNew") - @Log(title = "生成日报表查询", businessType = BusinessType.QUERY) + @Log(title = "生产日报表查询", businessType = BusinessType.QUERY) public TableDataInfo getDailyReportNew(MesDailyReportVo mesDailyReportVo) { startPage(); List list = mesReportWorkService.getDailyReportNew(mesDailyReportVo); 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..d9fdb886d 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,6 +455,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { if(sonMesReport == null){//单层工单的情况 sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto); } + //三层订单 + QuantityDto threeMesReport =new QuantityDto(); + if (sonMesReport != null ){ + QuantityDto quantityDtothree = new QuantityDto(); + quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode()); + quantityDtothree.setMachineCode(machineCode); + threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree); + } // 产量 Long sumQua = 0L; @@ -469,6 +477,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"