From 7ab70d6ba1b0ed96144f5fc31db91ba1ca798866 Mon Sep 17 00:00:00 2001 From: sunyugang Date: Tue, 26 Aug 2025 10:25:45 +0800 Subject: [PATCH] =?UTF-8?q?0826-=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProMonthReportServiceImpl.java | 10 +++++++++- .../service/impl/ProPowerConsumeServiceImpl.java | 12 ++++++++++++ .../com/ktg/mes/pro/task/ProConsumeTask.java | 16 ++++++++-------- .../wm/controller/WmIssueHeaderController.java | 9 +++++++++ .../mes/wm/controller/WmItemRecptController.java | 15 +++++++++++++++ .../wm/controller/WmProductRecptController.java | 9 +++++++++ .../wm/controller/WmProductSalseController.java | 9 +++++++++ .../com/ktg/mes/wm/vo/WmIssueHeaderExportVo.java | 8 ++++---- .../resources/mapper/pro/ProWorkorderMapper.xml | 2 +- .../resources/mapper/wm/WmProductSalseMapper.xml | 7 ++++++- 10 files changed, 82 insertions(+), 15 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java index b3912ad..5904588 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java @@ -55,7 +55,15 @@ public class ProMonthReportServiceImpl extends ServiceImpl 0 + && report.getProductQuantity() != null + && report.getProductQuantity().compareTo(new BigDecimal(0)) > 0 + && report.getMachineShopPower() !=null + && report.getMachineShopPower().compareTo(new BigDecimal(0)) > 0) { + BigDecimal produce = (report.getPower().add(report.getMachinePower())).divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP); + report.setPowerProduce(produce); + } report.setXSale(saleReport.getXSale()); report.setXdSale(saleReport.getXdSale()); this.saveOrUpdate(report); diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProPowerConsumeServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProPowerConsumeServiceImpl.java index 5269ea9..ef4955d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProPowerConsumeServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProPowerConsumeServiceImpl.java @@ -7,11 +7,16 @@ import com.ktg.common.utils.DateUtils; import com.ktg.common.utils.StringUtils; import com.ktg.mes.pro.domain.ProPowerConsume; import com.ktg.mes.pro.mapper.ProPowerConsumeMapper; +import com.ktg.mes.pro.service.IProMonthReportService; import com.ktg.mes.pro.service.IProPowerConsumeService; +import com.ktg.mes.pro.service.IProYearReportService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.Year; +import java.time.YearMonth; import java.util.List; /** @@ -23,6 +28,11 @@ import java.util.List; @Service public class ProPowerConsumeServiceImpl extends ServiceImpl implements IProPowerConsumeService { + @Autowired + private IProMonthReportService proMonthReportService; + @Autowired + private IProYearReportService proYearReportService; + @Override public List getPageList(ProPowerConsume proPowerConsume) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); @@ -89,5 +99,7 @@ public class ProPowerConsumeServiceImpl extends ServiceImpl list = wmIssueHeaderService.selectWmIssueHeaderListForExport(wmIssueHeader); + WmIssueHeaderExportVo sum = new WmIssueHeaderExportVo(); + sum.setItemCode("合计"); + sum.setQuantityIssued(new BigDecimal(0)); + for(WmIssueHeaderExportVo vo : list){ + if (vo.getQuantityIssued() != null) + sum.setQuantityIssued(sum.getQuantityIssued().add(vo.getQuantityIssued())); + } + list.add(sum); ExcelUtil util = new ExcelUtil(WmIssueHeaderExportVo.class); util.exportExcel(response, list, "生产领料数据"); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java index 7f4c053..ec9bde7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java @@ -1,5 +1,6 @@ package com.ktg.mes.wm.controller; +import java.math.BigDecimal; import java.util.List; import java.util.Map; import java.util.Set; @@ -80,6 +81,20 @@ public class WmItemRecptController extends BaseController public void export(HttpServletResponse response, WmItemRecpt wmItemRecpt) { List list = wmItemRecptService.selectWmItemRecptExportList(wmItemRecpt); + WmItemRecptExportVO sum = new WmItemRecptExportVO(); + sum.setRecptCode("合计"); + sum.setQuantity(0); + sum.setQuantityRecived(new BigDecimal(0)); + sum.setAmount(new BigDecimal(0)); + for(WmItemRecptExportVO vo : list){ + if (vo.getQuantity() != null) + sum.setQuantity(vo.getQuantity() + sum.getQuantity()); + if (vo.getQuantityRecived() != null) + sum.setQuantityRecived(vo.getQuantityRecived().add(sum.getQuantityRecived())); + if (vo.getAmount() != null) + sum.setAmount(vo.getAmount().add(sum.getAmount())); + } + list.add(sum); ExcelUtil util = new ExcelUtil<>(WmItemRecptExportVO.class); util.exportExcel(response, list, "物料入库单数据"); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java index 9ea1677..1f3e10d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java @@ -1,5 +1,6 @@ package com.ktg.mes.wm.controller; +import java.math.BigDecimal; import java.util.List; import java.util.Map; import java.util.Set; @@ -80,6 +81,14 @@ public class WmProductRecptController extends BaseController public void export(HttpServletResponse response, WmProductRecpt wmProductRecpt) { List list = wmProductRecptService.selectWmProductRecptExportVOList(wmProductRecpt); + WmProductRecptExportVO sum = new WmProductRecptExportVO(); + sum.setRecptCode("合计"); + sum.setQuantityRecived(new BigDecimal(0)); + for (WmProductRecptExportVO vo : list) { + if (vo.getQuantityRecived() != null) + sum.setQuantityRecived(sum.getQuantityRecived().add(vo.getQuantityRecived())); + } + list.add(sum); ExcelUtil util = new ExcelUtil<>(WmProductRecptExportVO.class); util.exportExcel(response, list, "产品入库录数据"); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java index 02ad0df..a06cad2 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductSalseController.java @@ -1,5 +1,6 @@ package com.ktg.mes.wm.controller; +import java.math.BigDecimal; import java.util.Collection; import java.util.List; import javax.annotation.Resource; @@ -85,6 +86,14 @@ public class WmProductSalseController extends BaseController public void export(HttpServletResponse response, WmProductSalse wmProductSalse) { List list = wmProductSalseService.selectWmProductSalseExportVOList(wmProductSalse); + WmProductSalseExportVO sum = new WmProductSalseExportVO(); + sum.setSalseCode("合计"); + sum.setQuantitySalse(new BigDecimal(0)); + for (WmProductSalseExportVO vo : list){ + if (vo.getQuantitySalse() != null) + sum.setQuantitySalse(sum.getQuantitySalse().add(vo.getQuantitySalse())); + } + list.add(sum); ExcelUtil util = new ExcelUtil<>(WmProductSalseExportVO.class); util.exportExcel(response, list, "销售出库单数据"); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/vo/WmIssueHeaderExportVo.java b/ktg-mes/src/main/java/com/ktg/mes/wm/vo/WmIssueHeaderExportVo.java index 2795b37..ae87d17 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/vo/WmIssueHeaderExportVo.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/vo/WmIssueHeaderExportVo.java @@ -17,15 +17,15 @@ import java.util.Date; @Data public class WmIssueHeaderExportVo { + /** 产品物料编码 */ + @Excel(name = "产品物料编码") + private String itemCode; + /** 领料日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "领料日期", width = 30, dateFormat = "yyyy-MM-dd") private Date issueDate; - /** 产品物料编码 */ - @Excel(name = "产品物料编码") - private String itemCode; - /** 产品物料名称 */ @Excel(name = "产品物料名称") private String itemName; diff --git a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml index ded157b..0dbbcf3 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" workorder_code as workorderCode, product_name as productName, client_name as clientName, - product_code as productSpc, + product_spc as productSpc, machinery_no as machineryNo, remark from pro_workorder diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml index c82eb1f..f3c3b5b 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml @@ -183,8 +183,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wps.area_id = #{areaId} and wps.area_code = #{areaCode} and wps.area_name like concat('%', #{areaName}, '%') - and wps.salse_date = #{salseDate} and wps.status = #{status} + + AND date_format(salse_date,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + AND date_format(salse_date,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + order by wps.create_time desc