From cab780b4dff9dc9168da1b67a9a902963af33a12 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 23 Apr 2025 10:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesReportWorkController.java | 2 +- .../mes/service/impl/MesReportWorkServiceImpl.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) 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 49396997f..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 @@ -456,10 +456,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto); } //三层订单 - QuantityDto quantityDtothree = new QuantityDto(); - quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode()); - quantityDtothree.setMachineCode(machineCode); - QuantityDto threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree); + 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; // 实际产量