From 452315d67339273fdba5ced57572e488cc723458 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 6 Nov 2023 08:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=B9=E7=BB=88=E5=AE=A1=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=8E=A8=E9=80=81=E9=87=91=E8=9D=B6=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=BA=94=E6=94=B6=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderLoancontractService.java                | 9 ++++++++-
 .../OtherReceivableBillCreditResultService.java          | 3 ++-
 .../fin/biz/kingdee/capitalcreditresult/data_model.json  | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
index c0db12a921..afdd852bbd 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
@@ -370,6 +370,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         String customerNumber = "";
                         //判断财务系统是否有客户
                         Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                        String linkNo = "";
                         if (!aBoolean) {
                             //  List<BdCustomer> bdCustomers = new ArrayList<>();
                             BdCustomer bdCustomer = new BdCustomer();
@@ -378,7 +379,6 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
                             bdCustomer.setTOrgIds(data.getOrgCode());
                             if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                String linkNo = "";
                                 if (busSalesOrderVehicle.getLinkNo().length() > 8) {
                                     linkNo = busSalesOrderVehicle.getLinkNo().substring(linkNo.length() - 8);
                                 } else {
@@ -396,6 +396,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         } else {
                             customerNumber = busSalesOrderVehicle.getTemporaryNo();
                         }
+                        String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
+                        if (StringUtils.isNotBlank(loanContractSid)) {
+                            BusSalesOrderLoancontract loancontract = fetchBySid(loanContractSid);
+                            if (null != loancontract) {
+                                creditResult.setBillNo(loancontract.getLoanContractNo() + linkNo);
+                            }
+                        }
                         creditResult.setCommUnit(customerNumber);
                         SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
                         creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
index c8d24fbd2e..58754a8ac4 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
@@ -32,7 +32,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
 //        if (creditResult.getBillNo() == null) {
 //            return rb.setMsg("单据编号不能为空");
 //        }
-//        map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
+        map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
         //业务日期
         if (creditResult.getBussDate() == null) {
             return rb.setMsg("业务日期不能为空");
@@ -40,6 +40,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
         map_fEntityModel_.put("FDATE", creditResult.getBussDate());
         //到期日期
         map_fEntityModel_.put("FENDDATE_H", creditResult.getBussDate());
+        map_fEntityModel_.put("FACCNTTIMEJUDGETIME", creditResult.getBussDate());
         //客户
         if (creditResult.getCommUnit() == null) {
             return rb.setMsg("客户编码不能为空");
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
index 0010f593fc..144c7f9c41 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
@@ -3,7 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "QTYSD01_SYS"
   },
-  "FBillNo": "",
+  "FBillNo": "@KD_FBillNo",
   "FDATE": "@KD_FDATE",
   "FENDDATE_H": "@KD_FENDDATE_H",
   "FISINIT": "false",
@@ -36,7 +36,7 @@
   "FSALEERID": {
     "FNumber": ""
   },
-  "FACCNTTIMEJUDGETIME": "1900-01-01",
+  "FACCNTTIMEJUDGETIME": "@KD_FACCNTTIMEJUDGETIME",
   "FSettleTypeID": {
     "FNumber": ""
   },