修改专项预提凭证

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -64,9 +64,6 @@ import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailssVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
 import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
@@ -504,16 +501,25 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
                                 }
                             }
 
-
+                            BigDecimal yuti = BigDecimal.ZERO; //预提
+                            BigDecimal qizhongzhichu = BigDecimal.ZERO;//其中支出费用
+                            BigDecimal qizhongdiding = BigDecimal.ZERO;//其中抵顶费用
                             BigDecimal fanliMoney = BigDecimal.ZERO;// 其中返利金额
                             BigDecimal daizhifuMoney = BigDecimal.ZERO;// 其中待支付金额
                             BigDecimal yingshouMoney = BigDecimal.ZERO;// 应收返利金额
                             if (StringUtils.isNotBlank(rebate.getEstimateRebate())) {
-                                fanliMoney = new BigDecimal(rebate.getEstimateRebate());
+                                yuti = new BigDecimal(rebate.getEstimateRebate());
+                            }
+                            if (null != rebate.getExpectItureCost()) {
+                                qizhongzhichu = rebate.getExpectItureCost();
                             }
                             if (null != rebate.getExpectTreatCost()) {
                                 daizhifuMoney = rebate.getExpectTreatCost();
                             }
+                            if (null != rebate.getExpectSuppCost()) {
+                                qizhongdiding = rebate.getExpectSuppCost();
+                            }
+                            fanliMoney = yuti.subtract(qizhongzhichu).subtract(daizhifuMoney).subtract(qizhongdiding);
                             yingshouMoney = fanliMoney.add(daizhifuMoney);
                             if (yingshouMoney.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();