1111

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -57,9 +57,9 @@ public class OverheadLineService {
            double measuresFee1 = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
            double measuresFee2 = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
            double measuresFee3 = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
-           double otherCost = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
-           double Fees = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
-           double Tex = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
+           double Tex = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
+           double otherCost = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
+           double Fees = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
            double qtFee = measuresFee1 + measuresFee2 + measuresFee3 + otherCost + Fees + Tex;
            double rgFee = jkxlDetailFee.getRgCost()!=null? jkxlDetailFee.getRgCost():0.00;
            double cbrFee = jkxlDetailFee.getCbrCost()!=null? jkxlDetailFee.getCbrCost():0.00;

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -165,7 +165,7 @@
                     "fbrcg1": "${data.originalFbrCost}",
                     "jxf1": "${data.originalJxCost}",
 
-                    "rgf2": "${data.jxCost}",
+                    "rgf2": "${data.rgCost}",
                     "cbrcg2": "${data.cbrCost}",
                     "fbrcg2":"${data.fbrCost}",
                     "jxf2": "${data.jxCost}",