王子文 月报 bug fix

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

@@ -329,7 +329,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
             tDailyProductionReport.setC3FrOxo(this.roundDecimal(this.getCellDataString(sheet, 24, 0), 0));
             // rowIndex = 25
             tDailyProductionReport.setMethaneYieldPercentage(this.roundPercentage(this.getCellDataString(sheet, 25, 6), 2));
-            tDailyProductionReport.setMethaneProduced(this.roundDecimal(this.getCellDataString(sheet, 25, 7), 0));
+            tDailyProductionReport.setMethaneProduced(this.roundDecimal(this.getCellDataString(sheet, 25, 7), 3));
             tDailyProductionReport.setMethaneToEoEg(this.roundDecimal(this.getCellDataString(sheet, 25, 8), 0));
             tDailyProductionReport.setAeuTolueneToShip(this.roundDecimal(this.getCellDataString(sheet, 25, 20), 0));
             tDailyProductionReport.setAeuTolueneFrShip(this.roundDecimal(this.getCellDataString(sheet, 25, 21), 0));
@@ -614,7 +614,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
             tDailyProductionReport.setElectricityPguAeuTT(this.roundDecimal(this.getCellDataString(sheet, 59, 10), 3));
             tDailyProductionReport.setElectricityPguAeuKgoe(this.roundDecimal(this.getCellDataString(sheet, 59, 11), 1));
             tDailyProductionReport.setElectricityPguAeuKgce(this.roundDecimal(this.getCellDataString(sheet, 59, 12), 1));
-            tDailyProductionReport.setElectricitySctuFlare(this.roundDecimal(this.getCellDataString(sheet, 59, 13), 0));
+            tDailyProductionReport.setElectricitySctuFlare(this.roundDecimal(this.getCellDataString(sheet, 59, 13), 3));
             tDailyProductionReport.setElectricitySub(this.roundDecimal(this.getCellDataString(sheet, 59, 14), 2));
             tDailyProductionReport.setElectricityBcc(this.roundDecimal(this.getCellDataString(sheet, 59, 15), 0));
             // rowIndex = 60

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

@@ -751,7 +751,7 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
         List<MonthlyProductionReportVO> monthlyProductionReportVOs = new ArrayList<>();
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("gaseity_yield", "gaseity","%"));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("tatal_yield", "tatal","%"));
-        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("c3_c2_yield", "C3/C2","%"));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("c3_c2_yield", "C3/C2",""));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("h2_yield", "H2","%"));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("ethylene_yield", "ethylene","%"));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("propylene_yield", "propylene","%"));
@@ -2080,7 +2080,7 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_sb","三苯收率",""));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_ljtw","裂解碳五收率",""));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_ljtj","裂解碳九收率",""));
-        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_ccsny","重整石脑油收率",""));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_ccsny","非芳收率",""));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_zqzh","蒸汽综合收率",""));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_lqs","冷却水收率",""));
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_sl_d","电收率",""));

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

@@ -224,7 +224,7 @@ public class SyncAfterDailyUpdateThread extends Thread {
         }
         BigDecimal c3C2Yield = new BigDecimal("0");
         if (ethylenProduced.compareTo(BigDecimal.ZERO) != 0) {
-            c3C2Yield = propyleneProduced.multiply(hundred).divide(ethylenProduced, 2, RoundingMode.HALF_UP);
+            c3C2Yield = propyleneProduced.divide(ethylenProduced, 3, RoundingMode.HALF_UP);
         }
         BigDecimal h2Yield = new BigDecimal("0");
         BigDecimal ethyleneYield = new BigDecimal("0");
@@ -245,7 +245,7 @@ public class SyncAfterDailyUpdateThread extends Thread {
             propyleneYield = propyleneProduced.subtract(c3FrOxo.multiply(new BigDecimal("0.68")));
             propyleneYield = propyleneYield.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
             c3C4LpgYield = c3C4LpgProduced.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
-            c4sYield = c4LpgProduced.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
+            c4sYield = mixedC4sProduced.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
             poYield = poFluxOilProduced.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
             naphthaleneYield = naphthaleneProduced.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
             eboYield = eboProduced.multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
@@ -523,7 +523,7 @@ public class SyncAfterDailyUpdateThread extends Thread {
 
         BigDecimal summaryClYb = ethylenProduced.add(propyleneProduced);
         BigDecimal summaryClYxjy = new BigDecimal("0").subtract(eboProduced);
-        BigDecimal summaryClHhc4 = new BigDecimal("0").subtract(c4LpgProduced);
+        BigDecimal summaryClHhc4 = new BigDecimal("0").subtract(mixedC4sProduced);
         BigDecimal summaryClSb = toluene.subtract(aeuBenzeneProduced).subtract(aeuTolueneProduced).subtract(aeuXyleneProduced);
         BigDecimal summaryClZqzh = shpCracker.add(hpCracker).add(mpCracker).add(lpCracker)
                 .add(shpPguAeu).add(hpPguAeu).add(mpPguAeu).add(lpPguAeu)
@@ -577,9 +577,9 @@ public class SyncAfterDailyUpdateThread extends Thread {
             summarySlYxjy = summaryClYxjy.divide(summaryClYb, 3, RoundingMode.HALF_UP);
             summarySlHhc4 = summaryClHhc4.divide(summaryClYb, 3, RoundingMode.HALF_UP);
             summarySlSb = summaryClSb.divide(summaryClYb, 3, RoundingMode.HALF_UP);
-            summarySlLjtw = pguC5Produced.divide(summaryClYb, 3, RoundingMode.HALF_UP);
-            summarySlLjtj = pguC9Produced.divide(summaryClYb, 3, RoundingMode.HALF_UP);
-            summarySlCcsny = aeuC6C8NaProduced.divide(summaryClYb, 3, RoundingMode.HALF_UP);
+            summarySlLjtw = new BigDecimal("0").subtract(pguC5Produced.divide(summaryClYb, 3, RoundingMode.HALF_UP));
+            summarySlLjtj = new BigDecimal("0").subtract(pguC9Produced.divide(summaryClYb, 3, RoundingMode.HALF_UP));
+            summarySlCcsny = new BigDecimal("0").subtract(aeuC6C8NaProduced.divide(summaryClYb, 3, RoundingMode.HALF_UP));
             summarySlZqzh = summaryClZqzh.divide(summaryClYb, 3, RoundingMode.HALF_UP);
             summarySlLqs = summaryClLqs.divide(summaryClYb, 3, RoundingMode.HALF_UP);
             summarySlD = summaryClD.divide(summaryClYb, 3, RoundingMode.HALF_UP);

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

@@ -305,8 +305,8 @@ public class SyncAfterMonthlyUpdateThread extends Thread {
         report.setSubConZfy(subConZfy.toString());
 
         report.setKbiPcur(crackerLoad.toString());
-        report.setKbiEnergyConsumption(crackerEnergyTeTeo.toString());
-        report.setKbiAeuEnergyConsumption(crackerEnergyEeKgect.toString());
+        report.setKbiEnergyConsumption(crackerEnergyEeKgeot.toString());
+        report.setKbiAeuEnergyConsumption(report.getAromaticsEnergyEeKgect());
 
         tMonthlyProductionReportMapper.updateTMonthlyProductionReport(report);
 

master/src/main/resources/mybatis/production/TDailyProductionReportMapper.xml

@@ -699,7 +699,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(d.lp_sctu_flare)as lpSctuFlare,
         sum(d.electricity_sctu_flare)as electricitySctuFlare,
         sum(d.cooling_water_sctu_flare)as coolingWaterSctuFlare,
-        sum(d.pa_ia_sctu_flare)as paIaSctuFlare
+        sum(d.pa_ia_sctu_flare)as paIaSctuFlare,
+        sum(d.electricity_sub) as electricitySub,
+        sum(d.ng_sub) as ngSub,
+        sum(d.fuel_gas_offgas_sub) as fuelGasOffgasSub,
+        sum(d.hhp_sub) as hhpSub,
+        sum(d.mp_sub) as mpSub,
+        sum(d.lp_sub) as lpSub,
+        sum(d.polished_con_sub) as polishedConSub,
+        sum(d.cooling_water_sub) as coolingWaterSub,
+        sum(d.n2_sub) as n2Sub,
+        sum(d.pa_ia_sub) as paIaSub,
+        sum(d.prod_water_sub) as prodWaterSub,
+        sum(d.hp_bfw_sub) as hpBfwSub,
+        sum(d.ng_sub) as ngSub
         from T_DAILY_PRODUCTION_REPORT d
         where extract(year from d.REPORT_DATE) = #{reportYear}
         and extract(month from d.REPORT_DATE) = #{reportMonth}

ui/src/views/production/daily/index.vue

@@ -2799,7 +2799,7 @@
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
-        :limit="31"
+        :limit="32"
         accept=".xlsx, .xls"
         :headers="upload.headers"
         :action="upload.url + '?updateSupport=' + upload.updateSupport"