王子文 月报 bug fix

master/src/main/java/com/ruoyi/project/production/service/impl/TDailyProductionReportServiceImpl.java

@@ -130,7 +130,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
             return "";
         }
         return new BigDecimal(raw)
-                .setScale(scale + 2, RoundingMode.HALF_EVEN)
+                .setScale(scale + 3, RoundingMode.HALF_EVEN)
                 .toString();
     }
 
@@ -147,7 +147,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
         }
         return new BigDecimal(raw)
                 .multiply(new BigDecimal("100"))
-                .setScale(scale + 2, RoundingMode.HALF_EVEN)
+                .setScale(scale + 3, RoundingMode.HALF_EVEN)
                 .toString() + "%";
     }
 

master/src/main/java/com/ruoyi/project/production/service/impl/thread/SyncAfterDailyUpdateThread.java

@@ -156,6 +156,7 @@ public class SyncAfterDailyUpdateThread extends Thread {
         crackerOutput = crackerOutput.add(h2Produced).add(ethylenProduced).add(propyleneProduced).add(c3LpgProduced)
                 .add(c4LpgProduced).add(mixedC4sProduced).add(rpgProduced).add(poFluxOilProduced).add(naphthaleneProduced)
                 .add(eboProduced).add(residueOilProduced).add(methaneProduced).add(offgasProduced);
+        crackerOutput = crackerOutput.divide(new BigDecimal("1"), 2, RoundingMode.HALF_UP);
         monthly.setCrackerOutput(crackerOutput.toString());
 
         String pguRpg2Str = daily.getPguRpg2();

master/src/main/java/com/ruoyi/project/production/service/impl/thread/SyncAfterMonthlyUpdateThread.java

@@ -308,7 +308,7 @@ public class SyncAfterMonthlyUpdateThread extends Thread {
                                     )
                                ).divide((subConHpSteamFrSubNet.add(subConHhpSteam)), 2, RoundingMode.HALF_UP);
         }
-        BigDecimal subConZfy = subConCostOutput.multiply(subConGljcl);
+        BigDecimal subConZfy = subConCostOutput.multiply(subConGljcl).divide(new BigDecimal("1"), 2, RoundingMode.HALF_UP);
         report.setSubConCostOutput(subConCostOutput.toString());
         report.setSubConZfy(subConZfy.toString());