质量月报 - 碳二反应器性能指标表格（部分）

master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java

@@ -357,6 +357,140 @@ public class TMonthlyQualityReportController extends BaseController
         if (propylene3InList.size() != 0) { propylene3InAvg = propylene3InSum.divide(new BigDecimal(propylene3InList.size()), 2, RoundingMode.HALF_UP); }
         if (pd3InList.size() != 0) { pd3InAvg = pd3InSum.divide(new BigDecimal(pd3InList.size()), 2, RoundingMode.HALF_UP); }
         if (ma3InList.size() != 0) { ma3InAvg = ma3InSum.divide(new BigDecimal(ma3InList.size()), 2, RoundingMode.HALF_UP); }
+        //%
+        BigDecimal acetyleneConversion1stIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal conversionLoad1stIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethyleneSelectivity1stIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal mapdConversion1stIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propyleneSelectivity1stIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetyleneConversion2ndIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal conversionLoad2ndIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethyleneSelectivity2ndIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal mapdConversion2ndIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propyleneSelectivity2ndIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetyleneConversion3rdIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal conversionLoad3rdIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethyleneSelectivity3rdIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal mapdConversion3rdIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propyleneSelectivity3rdIn = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetyleneConversion3rdOut = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethyleneSelectivity3rdOut = new BigDecimal(BigInteger.ZERO);
+        BigDecimal mapdConversion3rdOut = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propyleneSelectivity3rdOut = new BigDecimal(BigInteger.ZERO);
+        //计算%
+        if (acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            acetyleneConversion1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((acetylene1InAvg.subtract(acetylene2InAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
+        }
+        conversionLoad1stIn = acetyleneConversion1stIn;
+//        if (ethane1InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene1InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && ethane2InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene2InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            ethyleneSelectivity1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((ethylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(ethylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP)))
+//                    .divide(((acetylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(acetylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
+//        }
+        if ((pd1InAvg.add(ma1InAvg)).compareTo(BigDecimal.ZERO) != 0) {
+            mapdConversion1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((pd1InAvg.add(ma1InAvg).add(pd2InAvg).add(ma2InAvg)).divide(pd1InAvg.add(ma1InAvg), 2, RoundingMode.HALF_UP));
+        }
+//        if (propane1InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd1InAvg.compareTo(BigDecimal.ZERO) != 0 && ma1InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && propane2InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene2InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd2InAvg.compareTo(BigDecimal.ZERO) != 0 && ma2InAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            propyleneSelectivity1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((propylene2InAvg.divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP))
+//                     .subtract(propylene1InAvg.divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP)))
+//                     .divide((((pd1InAvg.add(ma1InAvg)).divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP))
+//                     .subtract((pd2InAvg.add(ma2InAvg).divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
+//        }
+        if (acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            acetyleneConversion2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((acetylene2InAvg.subtract(acetylene3InAvg)).divide(acetylene2InAvg, 2, RoundingMode.HALF_UP));
+        }
+        if (acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            conversionLoad2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((acetylene2InAvg.subtract(acetylene3InAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
+        }
+//        if (ethane2InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene2InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && ethane3InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            ethyleneSelectivity2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((ethylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(ethylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP)))
+//                    .divide(((acetylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(acetylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
+//        }
+        if ((pd2InAvg.add(ma2InAvg)).compareTo(BigDecimal.ZERO) != 0) {
+            mapdConversion2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((pd2InAvg.add(ma2InAvg).add(pd3InAvg).add(ma3InAvg)).divide(pd2InAvg.add(ma2InAvg), 2, RoundingMode.HALF_UP));
+        }
+//        if (propane2InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene2InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd2InAvg.compareTo(BigDecimal.ZERO) != 0 && ma2InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && propane3InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd3InAvg.compareTo(BigDecimal.ZERO) != 0 && ma3InAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            propyleneSelectivity2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((propylene3InAvg.divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP))
+//                    .subtract(propylene2InAvg.divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP)))
+//                    .divide((((pd2InAvg.add(ma2InAvg)).divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP))
+//                    .subtract((pd3InAvg.add(ma3InAvg).divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
+//        }
+        if (acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            acetyleneConversion3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((acetylene3InAvg.subtract(acetylene3OutAvg)).divide(acetylene3InAvg, 2, RoundingMode.HALF_UP));
+        }
+        if (acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            conversionLoad3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((acetylene3InAvg.subtract(acetylene3OutAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
+        }
+//        if (ethane3InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && ethane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3OutAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            ethyleneSelectivity3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((ethylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(ethylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP)))
+//                    .divide(((acetylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(acetylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
+//        }
+        if ((pd3InAvg.add(ma3InAvg)).compareTo(BigDecimal.ZERO) != 0) {
+            mapdConversion3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((pd3InAvg.add(ma3InAvg).add(pd3OutAvg).add(ma3OutAvg)).divide(pd3InAvg.add(ma3InAvg), 2, RoundingMode.HALF_UP));
+        }
+//        if (propane3InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd3InAvg.compareTo(BigDecimal.ZERO) != 0 && ma3InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && propane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3OutAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ma3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            propyleneSelectivity3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((propylene3OutAvg.divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP))
+//                    .subtract(propylene3InAvg.divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP)))
+//                    .divide((((pd3InAvg.add(ma3InAvg)).divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP))
+//                    .subtract((pd3OutAvg.add(ma3OutAvg).divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
+//        }
+        if (acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            acetyleneConversion3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((acetylene1InAvg.subtract(acetylene3OutAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
+        }
+//        if (ethane1InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene1InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && ethane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3OutAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            ethyleneSelectivity3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((ethylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(ethylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP)))
+//                    .divide(((acetylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP))
+//                    .subtract(acetylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
+//        }
+        if ((pd1InAvg.add(ma1InAvg)).compareTo(BigDecimal.ZERO) != 0) {
+            mapdConversion3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply((pd1InAvg.add(ma1InAvg).add(pd3OutAvg).add(ma3OutAvg)).divide(pd1InAvg.add(ma1InAvg), 2, RoundingMode.HALF_UP));
+        }
+//        if (propane1InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd1InAvg.compareTo(BigDecimal.ZERO) != 0 && ma1InAvg.compareTo(BigDecimal.ZERO) != 0
+//                && propane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3OutAvg.compareTo(BigDecimal.ZERO) != 0
+//                && pd3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ma3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+//            propyleneSelectivity3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
+//                    .multiply(((propylene3OutAvg.divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP))
+//                    .subtract(propylene1InAvg.divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP)))
+//                    .divide((((pd1InAvg.add(ma1InAvg)).divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP))
+//                    .subtract((pd3OutAvg.add(ma3OutAvg).divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
+//        }
         C2ReactorTableVO tableVO = new C2ReactorTableVO();
         tableVO.setEthane1InAvg(ethane1InAvg);
         tableVO.setEthylene1InAvg(ethylene1InAvg);
@@ -386,6 +520,25 @@ public class TMonthlyQualityReportController extends BaseController
         tableVO.setPropylene3InAvg(propylene3InAvg);
         tableVO.setPd3InAvg(pd3InAvg);
         tableVO.setMa3InAvg(ma3InAvg);
+        tableVO.setAcetyleneConversion1stIn(acetyleneConversion1stIn);
+        tableVO.setConversionLoad1stIn(conversionLoad1stIn);
+        tableVO.setEthyleneSelectivity1stIn(ethyleneSelectivity1stIn);
+        tableVO.setMapdConversion1stIn(mapdConversion1stIn);
+        tableVO.setPropyleneSelectivity1stIn(propyleneSelectivity1stIn);
+        tableVO.setAcetyleneConversion2ndIn(acetyleneConversion2ndIn);
+        tableVO.setConversionLoad2ndIn(conversionLoad2ndIn);
+        tableVO.setEthyleneSelectivity2ndIn(ethyleneSelectivity2ndIn);
+        tableVO.setMapdConversion2ndIn(mapdConversion2ndIn);
+        tableVO.setPropyleneSelectivity2ndIn(propyleneSelectivity2ndIn);
+        tableVO.setAcetyleneConversion3rdIn(acetyleneConversion3rdIn);
+        tableVO.setConversionLoad3rdIn(conversionLoad3rdIn);
+        tableVO.setEthyleneSelectivity3rdIn(ethyleneSelectivity3rdIn);
+        tableVO.setMapdConversion3rdIn(mapdConversion3rdIn);
+        tableVO.setPropyleneSelectivity3rdIn(propyleneSelectivity3rdIn);
+        tableVO.setAcetyleneConversion3rdOut(acetyleneConversion3rdOut);
+        tableVO.setEthyleneSelectivity3rdOut(ethyleneSelectivity3rdOut);
+        tableVO.setMapdConversion3rdOut(mapdConversion3rdOut);
+        tableVO.setPropyleneSelectivity3rdOut(propyleneSelectivity3rdOut);
         return AjaxResult.success(tableVO);
     }
 

master/src/main/java/com/ruoyi/project/production/controller/vo/C2ReactorTableVO.java

@@ -66,6 +66,196 @@ public class C2ReactorTableVO {
 
     private BigDecimal ma3InAvg;
 
+    private BigDecimal acetyleneConversion1stIn;
+
+    private BigDecimal conversionLoad1stIn;
+
+    private BigDecimal ethyleneSelectivity1stIn;
+
+    private BigDecimal mapdConversion1stIn;
+
+    private BigDecimal propyleneSelectivity1stIn;
+
+    private BigDecimal acetyleneConversion2ndIn;
+
+    private BigDecimal conversionLoad2ndIn;
+
+    private BigDecimal ethyleneSelectivity2ndIn;
+
+    private BigDecimal mapdConversion2ndIn;
+
+    private BigDecimal propyleneSelectivity2ndIn;
+
+    private BigDecimal acetyleneConversion3rdIn;
+
+    private BigDecimal conversionLoad3rdIn;
+
+    private BigDecimal ethyleneSelectivity3rdIn;
+
+    private BigDecimal mapdConversion3rdIn;
+
+    private BigDecimal propyleneSelectivity3rdIn;
+
+    private BigDecimal acetyleneConversion3rdOut;
+
+    private BigDecimal ethyleneSelectivity3rdOut;
+
+    private BigDecimal mapdConversion3rdOut;
+
+    private BigDecimal propyleneSelectivity3rdOut;
+
+    public BigDecimal getAcetyleneConversion1stIn() {
+        return acetyleneConversion1stIn;
+    }
+
+    public void setAcetyleneConversion1stIn(BigDecimal acetyleneConversion1stIn) {
+        this.acetyleneConversion1stIn = acetyleneConversion1stIn;
+    }
+
+    public BigDecimal getConversionLoad1stIn() {
+        return conversionLoad1stIn;
+    }
+
+    public void setConversionLoad1stIn(BigDecimal conversionLoad1stIn) {
+        this.conversionLoad1stIn = conversionLoad1stIn;
+    }
+
+    public BigDecimal getEthyleneSelectivity1stIn() {
+        return ethyleneSelectivity1stIn;
+    }
+
+    public void setEthyleneSelectivity1stIn(BigDecimal ethyleneSelectivity1stIn) {
+        this.ethyleneSelectivity1stIn = ethyleneSelectivity1stIn;
+    }
+
+    public BigDecimal getMapdConversion1stIn() {
+        return mapdConversion1stIn;
+    }
+
+    public void setMapdConversion1stIn(BigDecimal mapdConversion1stIn) {
+        this.mapdConversion1stIn = mapdConversion1stIn;
+    }
+
+    public BigDecimal getPropyleneSelectivity1stIn() {
+        return propyleneSelectivity1stIn;
+    }
+
+    public void setPropyleneSelectivity1stIn(BigDecimal propyleneSelectivity1stIn) {
+        this.propyleneSelectivity1stIn = propyleneSelectivity1stIn;
+    }
+
+    public BigDecimal getAcetyleneConversion2ndIn() {
+        return acetyleneConversion2ndIn;
+    }
+
+    public void setAcetyleneConversion2ndIn(BigDecimal acetyleneConversion2ndIn) {
+        this.acetyleneConversion2ndIn = acetyleneConversion2ndIn;
+    }
+
+    public BigDecimal getEthyleneSelectivity2ndIn() {
+        return ethyleneSelectivity2ndIn;
+    }
+
+    public void setEthyleneSelectivity2ndIn(BigDecimal ethyleneSelectivity2ndIn) {
+        this.ethyleneSelectivity2ndIn = ethyleneSelectivity2ndIn;
+    }
+
+    public BigDecimal getMapdConversion2ndIn() {
+        return mapdConversion2ndIn;
+    }
+
+    public void setMapdConversion2ndIn(BigDecimal mapdConversion2ndIn) {
+        this.mapdConversion2ndIn = mapdConversion2ndIn;
+    }
+
+    public BigDecimal getPropyleneSelectivity2ndIn() {
+        return propyleneSelectivity2ndIn;
+    }
+
+    public void setPropyleneSelectivity2ndIn(BigDecimal propyleneSelectivity2ndIn) {
+        this.propyleneSelectivity2ndIn = propyleneSelectivity2ndIn;
+    }
+
+    public BigDecimal getAcetyleneConversion3rdIn() {
+        return acetyleneConversion3rdIn;
+    }
+
+    public void setAcetyleneConversion3rdIn(BigDecimal acetyleneConversion3rdIn) {
+        this.acetyleneConversion3rdIn = acetyleneConversion3rdIn;
+    }
+
+    public BigDecimal getConversionLoad3rdIn() {
+        return conversionLoad3rdIn;
+    }
+
+    public void setConversionLoad3rdIn(BigDecimal conversionLoad3rdIn) {
+        this.conversionLoad3rdIn = conversionLoad3rdIn;
+    }
+
+    public BigDecimal getEthyleneSelectivity3rdIn() {
+        return ethyleneSelectivity3rdIn;
+    }
+
+    public void setEthyleneSelectivity3rdIn(BigDecimal ethyleneSelectivity3rdIn) {
+        this.ethyleneSelectivity3rdIn = ethyleneSelectivity3rdIn;
+    }
+
+    public BigDecimal getMapdConversion3rdIn() {
+        return mapdConversion3rdIn;
+    }
+
+    public void setMapdConversion3rdIn(BigDecimal mapdConversion3rdIn) {
+        this.mapdConversion3rdIn = mapdConversion3rdIn;
+    }
+
+    public BigDecimal getPropyleneSelectivity3rdIn() {
+        return propyleneSelectivity3rdIn;
+    }
+
+    public void setPropyleneSelectivity3rdIn(BigDecimal propyleneSelectivity3rdIn) {
+        this.propyleneSelectivity3rdIn = propyleneSelectivity3rdIn;
+    }
+
+    public BigDecimal getAcetyleneConversion3rdOut() {
+        return acetyleneConversion3rdOut;
+    }
+
+    public void setAcetyleneConversion3rdOut(BigDecimal acetyleneConversion3rdOut) {
+        this.acetyleneConversion3rdOut = acetyleneConversion3rdOut;
+    }
+
+    public BigDecimal getConversionLoad2ndIn() {
+        return conversionLoad2ndIn;
+    }
+
+    public void setConversionLoad2ndIn(BigDecimal conversionLoad2ndIn) {
+        this.conversionLoad2ndIn = conversionLoad2ndIn;
+    }
+
+    public BigDecimal getEthyleneSelectivity3rdOut() {
+        return ethyleneSelectivity3rdOut;
+    }
+
+    public void setEthyleneSelectivity3rdOut(BigDecimal ethyleneSelectivity3rdOut) {
+        this.ethyleneSelectivity3rdOut = ethyleneSelectivity3rdOut;
+    }
+
+    public BigDecimal getMapdConversion3rdOut() {
+        return mapdConversion3rdOut;
+    }
+
+    public void setMapdConversion3rdOut(BigDecimal mapdConversion3rdOut) {
+        this.mapdConversion3rdOut = mapdConversion3rdOut;
+    }
+
+    public BigDecimal getPropyleneSelectivity3rdOut() {
+        return propyleneSelectivity3rdOut;
+    }
+
+    public void setPropyleneSelectivity3rdOut(BigDecimal propyleneSelectivity3rdOut) {
+        this.propyleneSelectivity3rdOut = propyleneSelectivity3rdOut;
+    }
+
     public BigDecimal getEthane1InAvg() {
         return ethane1InAvg;
     }

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

@@ -2216,13 +2216,13 @@
           <td class="td-transparent">1st inlet</td>
           <td class="td-transparent">2nd inlet</td>
           <td class="td-transparent">3rd inlet</td>
-          <td class="td-transparent">4th inlet</td>
+          <td class="td-transparent">3rd outlet</td>
         </tr>
         <tr>
           <td class="td-dark-blue">ethane</td>
           <td class="td-dark-blue">{{c2ReactorTableData.ethane1InAvg}}</td>
-          <td class="td-dark-blue">{{c2ReactorTableData.ethane1InAvg}}</td>
           <td class="td-dark-blue">{{c2ReactorTableData.ethane2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethane3InAvg}}</td>
           <td class="td-dark-blue">{{c2ReactorTableData.ethane3OutAvg}}</td>
         </tr>
         <tr>
@@ -2269,38 +2269,38 @@
         </tr>
         <tr>
           <td class="td-dark-green">acetylene Conversion</td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-dark-green"></td>
+          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion1stIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion2ndIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion3rdIn}}</td>
+          <td class="td-dark-green">{{c2ReactorTableData.acetyleneConversion3rdOut}}</td>
         </tr>
         <tr>
           <td class="td-dark-green">Conversion load%</td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
+          <td class="td-transparent">{{c2ReactorTableData.conversionLoad1stIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.conversionLoad2ndIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.conversionLoad3rdIn}}</td>
           <td class="td-dark-green"></td>
         </tr>
         <tr>
           <td class="td-dark-green">Ethylene Selectivity</td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-dark-green"></td>
+          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity1stIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity2ndIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity3rdIn}}</td>
+          <td class="td-dark-green">{{c2ReactorTableData.ethyleneSelectivity3rdOut}}</td>
         </tr>
         <tr>
           <td class="td-dark-green">MAPD Conversion</td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-yellow"></td>
+          <td class="td-transparent">{{c2ReactorTableData.mapdConversion1stIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.mapdConversion2ndIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.mapdConversion3rdIn}}</td>
+          <td class="td-yellow">{{c2ReactorTableData.mapdConversion3rdOut}}</td>
         </tr>
         <tr>
           <td class="td-dark-green">Propylene Selectivity</td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-transparent"></td>
-          <td class="td-yellow"></td>
+          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity1stIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity2ndIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity3rdIn}}</td>
+          <td class="td-yellow">{{c2ReactorTableData.propyleneSelectivity3rdOut}}</td>
         </tr>
       </table>
       <table v-if="showC3Table">