蔡德晨 пре 5 година
родитељ
комит
e4bb8597d1
1 измењених фајлова са 6 додато и 4 уклоњено
  1. 6 4
      src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

+ 6 - 4
src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -99,7 +99,7 @@ public class JkxlController extends BaseController {
     double[] csRate = getCsRate(csqd);
     double[] gfRate = getGfRate(gf);
     double[] qtFees = getQtFees(qt);
-    double bzFees = getFees(total);
+    double[] wsbFees = getFees(total);
     double totalFee = 0.00;
     List<JkxlData> list = new ArrayList<>();
     int lastRow = importExcel.getLastDataRowNum();
@@ -276,7 +276,7 @@ public class JkxlController extends BaseController {
   /**
    * 获取补增值税税率调整差额和扣减甲供材超供材料费
    */
-  public double getFees(ImportExcel importExcel){
+  public double[] getFees(ImportExcel importExcel){
     int lastRow = importExcel.getLastDataRowNum();
     double bzFree = 0.00;
     double kcFree = 0.00;
@@ -291,8 +291,10 @@ public class JkxlController extends BaseController {
         break;
       }
     }
-
-    return  bzFree+kcFree;
+    double[] wsb = new double[2];
+    bzFree = wsb[0];
+    kcFree = wsb[1];
+    return  wsb;
 
   }