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-27 14:30:31 +08:00
parent edf25c677e
commit 3b35765e3f
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProMonthReport.java
View File

@@ -90,9 +90,9 @@ public class ProMonthReport {
private BigDecimal machineShopPower; private BigDecimal machineShopPower;
/** /**
* 吨/度 * 度/吨
*/ */
@Excel(name = "吨/度") @Excel(name = "度/吨")
private BigDecimal powerProduce; private BigDecimal powerProduce;
/** /**

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

@@ -61,7 +61,8 @@ public class ProMonthReportServiceImpl extends ServiceImpl<ProMonthReportMapper,
&& report.getProductQuantity().compareTo(new BigDecimal(0)) > 0 && report.getProductQuantity().compareTo(new BigDecimal(0)) > 0
&& report.getMachineShopPower() !=null && report.getMachineShopPower() !=null
&& report.getMachineShopPower().compareTo(new BigDecimal(0)) > 0) { && report.getMachineShopPower().compareTo(new BigDecimal(0)) > 0) {
BigDecimal produce = (report.getPower().add(report.getMachinePower())).divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP); BigDecimal power = report.getPower().add(report.getMachineShopPower());
BigDecimal produce = power.divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
report.setPowerProduce(produce); report.setPowerProduce(produce);
} }
if (saleReport.getXSale() != null){ if (saleReport.getXSale() != null){
@@ -124,8 +125,10 @@ public class ProMonthReportServiceImpl extends ServiceImpl<ProMonthReportMapper,
proMonthReport.setMachineShopPower(obj.getMachinePower()); proMonthReport.setMachineShopPower(obj.getMachinePower());
// 吨/度=当月（南北电消耗+机修房电消耗）/成品 // 吨/度=当月（南北电消耗+机修房电消耗）/成品
BigDecimal power = proMonthReport.getPower().add(proMonthReport.getMachineShopPower()); BigDecimal power = proMonthReport.getPower().add(proMonthReport.getMachineShopPower());
BigDecimal powerProduce = proMonthReport.getProductQuantity().divide(power, 4, BigDecimal.ROUND_HALF_UP); if (proMonthReport.getProductQuantity() != null && proMonthReport.getProductQuantity().compareTo(new BigDecimal(0)) > 0) {
proMonthReport.setPowerProduce(powerProduce); BigDecimal powerProduce = power.divide(proMonthReport.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
proMonthReport.setPowerProduce(powerProduce);
}
this.updateById(proMonthReport); this.updateById(proMonthReport);
} }
} }

2
ktg-mes/src/main/resources/mapper/pro/ProMonthReportMapper.xml
View File

@@ -28,7 +28,7 @@
left join wm_product_salse_line wpsl on wps.salse_id = wpsl.salse_id left join wm_product_salse_line wpsl on wps.salse_id = wpsl.salse_id
left join md_item mi on wpsl.item_id = mi.item_id left join md_item mi on wpsl.item_id = mi.item_id
where date_format(wps.salse_date,'%y%m%d') &gt;= date_format(#{beginDate},'%y%m%d') where date_format(wps.salse_date,'%y%m%d') &gt;= date_format(#{beginDate},'%y%m%d')
and date_format(wps.salse_date,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d') and date_format(wps.salse_date,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d') and wps.status = 'FINISHED'
</select> </select>
<select id="powerYearSummaryStatistics" resultType="com.ktg.mes.pro.domain.ProMonthReport"> <select id="powerYearSummaryStatistics" resultType="com.ktg.mes.pro.domain.ProMonthReport">