王子文 生产日报 添加字段OFFGAS_TO_GAA_CAA

master/src/main/java/com/ruoyi/project/production/domain/TDailyProductionReport.java

@@ -39,6 +39,10 @@ public class TDailyProductionReport extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String nap;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String offgasToGaaCaa;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String c5;
@@ -6979,6 +6983,14 @@ public class TDailyProductionReport extends BaseEntity
         this.pguAeuTotalLoss = pguAeuTotalLoss;
     }
 
+    public String getOffgasToGaaCaa() {
+        return offgasToGaaCaa;
+    }
+
+    public void setOffgasToGaaCaa(String offgasToGaaCaa) {
+        this.offgasToGaaCaa = offgasToGaaCaa;
+    }
+
     public String getPguAeuTotalLoss()
     {
         return pguAeuTotalLoss;

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

@@ -279,6 +279,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
             tDailyProductionReport.setPoFluxOilImport(this.roundDecimal(this.getCellDataString(sheet, 19, 10), 0));
             tDailyProductionReport.setPoFluxOilExport(this.roundDecimal(this.getCellDataString(sheet, 19, 11), 0));
             tDailyProductionReport.setPoFluxOilToBd(this.roundDecimal(this.getCellDataString(sheet, 19, 12), 0));
+            tDailyProductionReport.setOffgasToGaaCaa(this.roundDecimal(this.getCellDataString(sheet, 19, 18), 0));
             // rowIndex = 20
             tDailyProductionReport.setRaffinate2pFr2ph(this.roundDecimal(this.getCellDataString(sheet, 20, 0), 0));
             tDailyProductionReport.setAeuBenzeneToYbs(this.roundDecimal(this.getCellDataString(sheet, 20, 20), 0));

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

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TDailyProductionReport" id="TDailyProductionReportResult">
         <result property="id"    column="id"    />
+        <result property="offgasToGaaCaa"    column="offgas_to_gaa_caa"    />
         <result property="col320fc2161"    column="col_320fc2161"    />
         <result property="c210pdi"    column="c210pdi"    />
         <result property="temperature"    column="temperature"    />
@@ -544,7 +545,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectTDailyProductionReportVo">
         select
-            d.id, d.from_date, d.to_date, d.report_date, d.nap, d.c5, d.c6_c8_na, d.wison_ethane, d.lpg_to_furnace, d.raff1_fr_bd, d.raff2_fr_ib,
+            d.id, d.offgas_to_gaa_caa, d.from_date, d.to_date, d.report_date, d.nap, d.c5, d.c6_c8_na, d.wison_ethane, d.lpg_to_furnace, d.raff1_fr_bd, d.raff2_fr_ib,
             d.raff3_fr_bd, d.raffinate2p_fr_2ph, d.c2_fr_ldpe, d.c3_fr_oxo, d.mixed_c3_c4, d.hy_c9, d.pgu_offgas, d.wash_oil, d.toluene, d.hy_c4_fr_r800,
             d.h2_yield_percentage, d.h2_produced, d.h2_inventory, d.h2_change, d.h2_import, d.h2_export, d.h2_to_pgu, d.h2_to_ypc, d.h2_to_oxo,
             d.h2_fr_syngas_to_sub, d.ethylen_yield_percentage, d.ethylen_produced, d.ethylen_inventory, d.ethylen_change, d.ethylen_import, d.ethylen_export,
@@ -634,6 +635,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTDailyProductionReportVo"/>
         <where>  
             <if test="fromDate != null "> and from_date = #{fromDate}</if>
+            <if test="offgasToGaaCaa != null "> and offgas_to_gaa_caa = #{offgasToGaaCaa}</if>
             <if test="toDate != null "> and to_date = #{toDate}</if>
             <if test="reportDate != null "> and report_date = #{reportDate}</if>
             <if test="nap != null  and nap != ''"> and nap = #{nap}</if>
@@ -1180,6 +1182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="col320fc2161 != null">col_320fc2161,</if>
+            <if test="offgasToGaaCaa != null">offgas_to_gaa_caa,</if>
             <if test="c210pdi != null">c210pdi,</if>
             <if test="temperature != null">temperature,</if>
             <if test="crackingFurnaceBurn != null">cracking_furnace_burn,</if>
@@ -1716,6 +1719,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="col320fc2161 != null">#{col320fc2161},</if>
+            <if test="offgasToGaaCaa != null">#{offgasToGaaCaa},</if>
             <if test="c210pdi != null">#{c210pdi},</if>
             <if test="temperature != null">#{temperature},</if>
             <if test="crackingFurnaceBurn != null">#{crackingFurnaceBurn},</if>
@@ -2258,6 +2262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTDailyProductionReport" parameterType="TDailyProductionReport">
         update t_daily_production_report
         <trim prefix="SET" suffixOverrides=",">
+            <if test="offgasToGaaCaa != null">offgas_to_gaa_caa = #{offgasToGaaCaa},</if>
             <if test="pguC5RaffInput != null">pgu_c5_raff_input = #{pguC5RaffInput},</if>
             <if test="col320fc2161 != null">col_320fc2161 = #{col320fc2161},</if>
             <if test="c210pdi != null">c210pdi = #{c210pdi},</if>
@@ -2799,6 +2804,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTDailyProductionReportByReportDate" parameterType="TDailyProductionReport">
         update t_daily_production_report
         <trim prefix="SET" suffixOverrides=",">
+            <if test="offgasToGaaCaa != null">offgas_to_gaa_caa = #{offgasToGaaCaa},</if>
             <if test="pguC5RaffInput != null">pgu_c5_raff_input = #{pguC5RaffInput},</if>
             <if test="col320fc2161 != null">col_320fc2161 = #{col320fc2161},</if>
             <if test="c210pdi != null">c210pdi = #{c210pdi},</if>

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

@@ -636,7 +636,9 @@
               <el-input v-if="updating" size="mini" v-model="reportData.poFluxOilExport"/>
             </td>
             <td class="bg-blue-light">To BD</td>
-            <td class="no-border" colspan="9"></td>
+            <td class="no-border" colspan="5"></td>
+            <td class="bg-blue-light">To GAA/CAA</td>
+            <td class="no-border" colspan="3"></td>
             <td class="bg-yellow-light" @click="openDialog('aeu_benzene_to_ship', 'AEU Benzene To Ship')">
               <span v-if="!updating">{{reportData.aeuBenzeneToShip}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.aeuBenzeneToShip"/>
@@ -653,7 +655,12 @@
               <span v-if="!updating">{{reportData.poFluxOilToBd}}</span>
               <el-input v-if="updating" size="mini" v-model="reportData.poFluxOilToBd"/>
             </td>
-            <td class="no-border" colspan="9"></td>
+            <td class="no-border" colspan="5"></td>
+            <td class="bg-yellow-light" @click="openDialog('offgas_to_gaa_caa', 'Offgas To GAA/CAA')">
+              <span v-if="!updating">{{reportData.offgasToGaaCaa}}</span>
+              <el-input v-if="updating" size="mini" v-model="reportData.offgasToGaaCaa"/>
+            </td>
+            <td class="no-border" colspan="3"></td>
             <td class="bg-blue-light">To YBS</td>
             <td class="bg-blue-light"></td>
           </tr>
@@ -2906,6 +2913,7 @@ export default {
       // 每日生产报告数据
       reportData: {
         id: null,
+        offgasToGaaCaa: null,
         pguC5RaffInput: null,
         fromDate: null,
         toDate: null,
@@ -4305,6 +4313,7 @@ export default {
     getReport() {
       this.loading = true;
       listReport(this.queryParams).then(response => {
+        console.log(response.rows);
         if (response.rows.length != 0) {
           this.lastSelectedDate = this.queryParams.reportDate;
           this.reportData = response.rows[0];

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

@@ -70,7 +70,6 @@
           monthListTemp.push(this.monthList[i] + "-" + this.year);
         }
         this.monthList = monthListTemp;
-        console.log(this.monthList);
       },
     }
 </script>