1111

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

@@ -364,10 +364,10 @@ public class OverheadLineService {
                 double fbrCost = originalFbrCost/(1+jxslJz); //后发包人采购
                 double originalJxrCost = originalJzFees[i][3];   //原机械费
                 double jxCost = originalJxrCost/(1+tcRate[2]); //后机械费
-                double measuresFee1 = (zjgcJzFee-originalFbrCost)*jzcsRate; //措施费一（2）
+                double measuresFee1 = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzcsRate; //措施费一（2）
                 double measuresFee2 = 0.00;   //措施费一（1）
                 double measuresFee3 = 0.00; //措施费二
-                double fees = (zjgcJzFee-originalFbrCost)*jzgfRate[0]+(zjgcJzFee-originalFbrCost)*jzgfRate[1]*0.2;  //规费
+                double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[0]+(zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[1]*0.2;  //规费
                 double tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee)*texRate; //税金
                 double totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
                 jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
@@ -499,10 +499,10 @@ public class OverheadLineService {
                 double fbrCost = originalFbrCost/(1+jxslJz); //后发包人采购
                 double originalJxrCost = originalJzFees[i][3];   //原机械费
                 double jxCost = originalJxrCost/(1+tcRate[2]); //后机械费
-                double measuresFee1 = (zjgcJzFee-originalFbrCost)*jzcsRate; //措施费一（2）
+                double measuresFee1 = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzcsRate; //措施费一（2）
                 double measuresFee2 = 0.00;   //措施费一（1）
                 double measuresFee3 = 0.00; //措施费二
-                double fees = (zjgcJzFee-originalFbrCost)*jzgfRate[0]+(zjgcJzFee-originalFbrCost)*jzgfRate[1]*0.2;  //规费
+                double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[0]+(zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[1]*0.2;  //规费
                 double tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee)*texRate; //税金
                 double totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
                 jkxlDetailFee.setOriginalTotalCost(originalTotalCost);