修改核销到销路通传参

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -83,8 +83,8 @@ public class TbsCostApplyController {
     //@PostMapping("/testChangeAmt")
     public R<?> testChangeAmt(@RequestBody TbsAffairCommitBo param){
         TbsCostApplyOperationServiceImpl impl = SpringUtils.getBean(TbsCostApplyOperationServiceImpl.class);
-        BigDecimal total = impl.checkToChangeAmount(param);
-        return R.ok(total);
+        impl.doFinished(param);
+        return R.ok();
     }
 
     /**

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -321,7 +321,8 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
             }
             TbsBudgetLog budgetLog = budgetCostItem.toBudgetLog(
                     costApply,
-                    BudgetLogOptFlag.State_6,
+                    //BudgetLogOptFlag.State_6,
+                    BudgetLogOptFlag.State_7,
                     currentCenterGoods.getCenterGoodsAmount(),
                     sysUser,
                     budgetCode

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -170,6 +170,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         BigDecimal n10000 = new BigDecimal("10000");
         List<TbsActivityCenter> activityCenters4Update = new ArrayList<>();
         List<TbsActivitySubject> activitySubject4Update = new ArrayList<>();
+        int countCode = 1;
         for (TbsActivitySubject activitySubject : activitySubjectList) {
             if(tempTotal.compareTo(BigDecimal.ZERO)<1){
                 break;
@@ -242,11 +243,31 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                     fundFlowService.saveBatch(addFundFlowList);
                 }
             }
+            //保存费用结果
+            VtbVerificationSubject verificationSubject = new VtbVerificationSubject();
+            String vtbSubCode = verification.getVerificationCode()+"_"+countCode;
+            verificationSubject.setVerificationSubCode(vtbSubCode);
+            countCode++;
+            verificationSubject.setCostApplyId(costApply.getId());
+            verificationSubject.setActivityId(activity.getId());
+            verificationSubject.setSubjectId(activitySubject.getSubjectId());
+            verificationSubject.setSubjectCode(activitySubject.getSubjectCode());
+            verificationSubject.setSubjectName(activitySubject.getSubjectName());
+            verificationSubject.setSupplierId(activity.getSupplierId());
+            verificationSubject.setSupplierCode(activity.getSupplierCode());
+            verificationSubject.setSupplierName(activity.getSupplierName());
+            verificationSubject.setUsedAmount(currentSubjectAmt);
+            verificationSubject.setUsedAmountRecord(currentSubjectAmt);
+            verificationSubject.setCountPerson(param.getCountPerson());
+            verificationSubject.setCountSession(param.getCountSession());
+            verificationSubject.setRemark(param.getRemark());
+            verificationSubjectService.save(verificationSubject);
+
             //发送请求到中间服务
             XltApticlaim apticlaim = new XltApticlaim();
             apticlaim.setVerificationCode(verification.getVerificationCode());
-            apticlaim.setCostCode(costApply.getCode());
-            apticlaim.setCostCode2(activity.getActivityCode());
+            apticlaim.setCostCode(vtbSubCode);
+            apticlaim.setCostCode2(vtbSubCode);
             apticlaim.setCusCode(verification.getSupplierCode());
             apticlaim.setAmount(currentSubjectAmt);
             apticlaim.setSubjectCode(activitySubject.getSubjectCode());
@@ -903,8 +924,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             //发送请求到中间服务
             XltApticlaim apticlaim = new XltApticlaim();
             apticlaim.setVerificationCode(verificationSubject.getVerificationSubCode());
-            apticlaim.setCostCode(costApply.getCode());
-            apticlaim.setCostCode2(activity.getActivityCode());
+            apticlaim.setCostCode(verificationSubject.getVerificationSubCode());
+            apticlaim.setCostCode2(verificationSubject.getVerificationSubCode());
             apticlaim.setCusCode(verificationSubject.getSupplierCode());
             apticlaim.setAmount(verificationSubject.getUsedAmount());
             apticlaim.setSubjectCode(verificationSubject.getSubjectCode());

src/main/java/com/qs/serve/task/TbsTask.java

@@ -50,6 +50,10 @@ public class TbsTask {
         lqw.in(TbsActivity::getCostApplyId,costApplyIds);
         lqw.le(TbsActivity::getPreCheckDate, LocalDate.now());
         lqw.eq(TbsActivity::getReopenFlag,0);
+        // 2-完成；4-已释放；5-已关闭 表流程已完结，冻结无意义
+        lqw.eq(TbsActivity::getActivityState,TbsActivityState.STATE_0_Todo);
+        //通过审批的
+        lqw.eq(TbsActivity::getCostPassFlag,1);
         TbsActivity param = new TbsActivity();
         param.setActivityState(TbsActivityState.STATE_1_Baning);
         activityService.update(param,lqw);