fix report

plp
chenshuichuan 2 years ago
parent dafcffbacf
commit c3c9ac4ecc

@ -122,7 +122,7 @@ public class AppOrgWorkerController {
appSaveVo.setReportDate(localDateTime); appSaveVo.setReportDate(localDateTime);
ProduceReportSaveReqVO createReqVO = BeanUtils.toBean(appSaveVo,ProduceReportSaveReqVO.class); ProduceReportSaveReqVO createReqVO = BeanUtils.toBean(appSaveVo,ProduceReportSaveReqVO.class);
createReqVO.setProduceReportDetails(appSaveVo.getProductList()); createReqVO.setProduceReportDetails(appSaveVo.getProduceReportDetails());
return success(produceReportService.createProduceReport(createReqVO)); return success(produceReportService.createProduceReport(createReqVO));
} }

@ -52,7 +52,7 @@ public class AppReportSaveReqVO {
private LocalDateTime reportDate; private LocalDateTime reportDate;
@Schema(description = "生产报工明细列表") @Schema(description = "生产报工明细列表")
private List<ProduceReportDetailDO> productList; private List<ProduceReportDetailDO> produceReportDetails;
@Schema(description = "报工日期字符串") @Schema(description = "报工日期字符串")
private String reportDateString; private String reportDateString;
} }

@ -167,6 +167,7 @@ public class ProduceReportServiceImpl implements ProduceReportService {
.setUserId(reportDO.getUserId()).setReportType(reportDO.getReportType()) .setUserId(reportDO.getUserId()).setReportType(reportDO.getReportType())
.setProductId(map.get(o.getPlanId()).getProductId()) .setProductId(map.get(o.getPlanId()).getProductId())
.setQualityNumber(o.getQualityNumber()==null?BigDecimal.ZERO: o.getQualityNumber()) .setQualityNumber(o.getQualityNumber()==null?BigDecimal.ZERO: o.getQualityNumber())
.setPackageNumber(o.getPackageNumber()==null?BigDecimal.ZERO: o.getPackageNumber())
.setWasteNumber(o.getWasteNumber()==null?BigDecimal.ZERO: o.getWasteNumber()) .setWasteNumber(o.getWasteNumber()==null?BigDecimal.ZERO: o.getWasteNumber())
.setTotalNumber(o.getQualityNumber().add(o.getWasteNumber())) .setTotalNumber(o.getQualityNumber().add(o.getWasteNumber()))
); );

Loading…
Cancel
Save