yzc 1 жил өмнө
parent
commit
53bf3b8a68

+ 20 - 0
hx-form/src/main/java/com/fjhx/form/flow/CostControlFlow.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
 import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
 import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.account.service.account.AccountPaymentService;
+import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.coding.CodingRuleService;
@@ -47,6 +49,8 @@ public class CostControlFlow extends FlowDelegate {
     private StockJournalDetailsService stockJournalDetailsService;
     private StockJournalDetailsService stockJournalDetailsService;
     @Autowired
     @Autowired
     private AccountPaymentService accountPaymentService;
     private AccountPaymentService accountPaymentService;
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
 
 
     @Override
     @Override
     public String getFlowKey() {
     public String getFlowKey() {
@@ -125,6 +129,22 @@ public class CostControlFlow extends FlowDelegate {
             payment.setDepartmentId(SecurityUtils.getDeptId());
             payment.setDepartmentId(SecurityUtils.getDeptId());
 
 
             accountPaymentService.save(payment);
             accountPaymentService.save(payment);
+        } else {
+            //添加一条资金流水
+            AccountRunningWater accountRunningWater = new AccountRunningWater();
+            accountRunningWater.setCompanyId(costControl.getCompanyId());
+            accountRunningWater.setAccountManagementId(null);
+            accountRunningWater.setStatus("10");// 收入
+            accountRunningWater.setBusinessId(costControl.getId());
+            accountRunningWater.setAmount(costControl.getAmount());
+            accountRunningWater.setCurrency("CNY");
+            accountRunningWater.setReceived("20");// 合同到账(10:是,20:否)
+            accountRunningWater.setName(costControl.getAccountName());
+            accountRunningWater.setOpeningBank(costControl.getAccountBank());
+            accountRunningWater.setAccountOpening(costControl.getAccountNumber());
+//            accountRunningWater.setType("20"); // 添加流水类型 10 打款  20 到款登记
+            accountRunningWater.setTransactionTime(costControl.getApplyTime());
+            accountRunningWaterService.save(accountRunningWater);
         }
         }
     }
     }