sun15684712291/impm_zxf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0826-需求变更问题修改

Browse Source
This commit is contained in:
sunyg
2025-08-26 16:48:47 +08:00
parent 7ab70d6ba1
commit edf25c677e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java
View File

@@ -64,7 +64,16 @@ public class ProMonthReportServiceImpl extends ServiceImpl<ProMonthReportMapper,
BigDecimal produce = (report.getPower().add(report.getMachinePower())).divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP); BigDecimal produce = (report.getPower().add(report.getMachinePower())).divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
report.setPowerProduce(produce); report.setPowerProduce(produce);
} }
report.setXSale(saleReport.getXSale()); if (saleReport.getXSale() != null){
report.setXSale(saleReport.getXSale().divide(new BigDecimal(1000)));
}else {
report.setXSale(BigDecimal.ZERO);
}
if (saleReport.getXdSale() != null){
report.setXdSale(saleReport.getXdSale().divide(new BigDecimal(1000)));
}else {
report.setXdSale(BigDecimal.ZERO);
}
report.setXdSale(saleReport.getXdSale()); report.setXdSale(saleReport.getXdSale());
this.saveOrUpdate(report); this.saveOrUpdate(report);
} }

1
ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
View File

@@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="machineryId" column="machinery_id" /> <result property="machineryId" column="machinery_id" />
<result property="machineryCode" column="machinery_code" /> <result property="machineryCode" column="machinery_code" />
<result property="machineryName" column="machinery_name" /> <result property="machineryName" column="machinery_name" />