1111

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

@@ -352,6 +352,17 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setTotalFee(total1+btex*rate);
             }
         }
+        //其他费用补税
+        if(qtFees[0]+qtFees[1] != 0.00) {
+            for (JkxlDetailFee jkxlDetailFee : list) {
+                double tex = jkxlDetailFee.getTex();
+                double total1 = jkxlDetailFee.getTotalFee();
+                double rate = tex / texTotal;
+                double tzTex = (qtFees[0] + qtFees[1]) * rate * texRate;
+                jkxlDetailFee.setTex(tex + tzTex);
+                jkxlDetailFee.setTotalFee(total1 + tzTex);
+            }
+        }
         //承包人采购设备费
         if(cbrfee != 0.00){
             for(JkxlDetailFee jkxlDetailFee : list){
@@ -368,7 +379,11 @@ public List<JkxlDetailFee> findList(String id,String type){
            for(JkxlAdjustFee jkxlAdjustFee : wsbFees){
                jkxlAdjustFee.setId(id);
                feeAdjustService.save(jkxlAdjustFee);
-               wsbfee += jkxlAdjustFee.getFee();
+               double fee = jkxlAdjustFee.getFee();
+               if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                   fee = fee* -1;
+                }
+               wsbfee += fee;
            }
        }
        double gxFee = Math.abs(gcjsFee-tz-qtFees[0]-qtFees[1]-wsbfee);
@@ -779,6 +794,17 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setTotalFee(total1+btex*rate);
             }
         }
+        //其他费用补税
+        if(qtFees[0]+qtFees[1] != 0.00) {
+            for (JkxlDetailFee jkxlDetailFee : list) {
+                double tex = jkxlDetailFee.getTex();
+                double total1 = jkxlDetailFee.getTotalFee();
+                double rate = tex / texTotal;
+                double tzTex = (qtFees[0] + qtFees[1]) * rate * texRate;
+                jkxlDetailFee.setTex(tex + tzTex);
+                jkxlDetailFee.setTotalFee(total1 + tzTex);
+            }
+        }
         //承包人设备费
         if(cbrfee != 0.00){
             for(JkxlDetailFee jkxlDetailFee : list){
@@ -798,7 +824,11 @@ public List<JkxlDetailFee> findList(String id,String type){
             for(JkxlAdjustFee jkxlAdjustFee : wsbFees){
                 jkxlAdjustFee.setId(id);
                 feeAdjustService.save(jkxlAdjustFee);
-                wsbfee += jkxlAdjustFee.getFee();
+                double fee = jkxlAdjustFee.getFee();
+                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                    fee = fee* -1;
+                }
+                wsbfee += fee;
             }
         }
         double gxFee = Math.abs(gcjsFee-tz-qtFees[0]-qtFees[1]-wsbfee);