更改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -52,6 +52,7 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
@@ -61,6 +62,7 @@ import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
 import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
@@ -186,6 +188,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -1671,6 +1675,23 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
             voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
             voucherResultDetailDtos.add(voucherResultDetailDto);
+        }else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())){//平仓款
+            //借方
+            FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
+            voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+            voucherResultDetailDto.setSubjectNo("1009.03");
+            SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
+            voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
+            String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+            voucherResultDetailDto.setBank(key);
+            voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+            //贷方
+            voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+            voucherResultDetailDto.setSubjectNo("1002.01.00");
+            voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+            voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
         }
         voucher.setResultDetails(voucherResultDetailDtos);
         finKingDeeFeign.saveVoucher(voucher);