From c3c9ac4eccb2d001d82c492209acba809e9c80bf Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Wed, 17 Jul 2024 23:33:08 +0800 Subject: [PATCH] fix report --- .../module/mes/controller/admin/app/AppOrgWorkerController.java | 2 +- .../module/mes/controller/admin/app/vo/AppReportSaveReqVO.java | 2 +- .../mes/service/producereport/ProduceReportServiceImpl.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java index 1d95811eaf..12f0a5d9b4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java @@ -122,7 +122,7 @@ public class AppOrgWorkerController { appSaveVo.setReportDate(localDateTime); ProduceReportSaveReqVO createReqVO = BeanUtils.toBean(appSaveVo,ProduceReportSaveReqVO.class); - createReqVO.setProduceReportDetails(appSaveVo.getProductList()); + createReqVO.setProduceReportDetails(appSaveVo.getProduceReportDetails()); return success(produceReportService.createProduceReport(createReqVO)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/vo/AppReportSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/vo/AppReportSaveReqVO.java index 8afd2e31bc..66f6599415 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/vo/AppReportSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/vo/AppReportSaveReqVO.java @@ -52,7 +52,7 @@ public class AppReportSaveReqVO { private LocalDateTime reportDate; @Schema(description = "生产报工明细列表") - private List productList; + private List produceReportDetails; @Schema(description = "报工日期字符串") private String reportDateString; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java index 0fc7bb31e4..705cffe928 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java @@ -167,6 +167,7 @@ public class ProduceReportServiceImpl implements ProduceReportService { .setUserId(reportDO.getUserId()).setReportType(reportDO.getReportType()) .setProductId(map.get(o.getPlanId()).getProductId()) .setQualityNumber(o.getQualityNumber()==null?BigDecimal.ZERO: o.getQualityNumber()) + .setPackageNumber(o.getPackageNumber()==null?BigDecimal.ZERO: o.getPackageNumber()) .setWasteNumber(o.getWasteNumber()==null?BigDecimal.ZERO: o.getWasteNumber()) .setTotalNumber(o.getQualityNumber().add(o.getWasteNumber())) );