From 65ed39fab52b68bf54430e83326d6fd60a33bd26 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 2 Mar 2023 14:43:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/commoncontract/CommonContractService.java | 10 +++++++---
 .../biz/bussalesorder/BusSalesOrderMapper.xml          |  4 +++-
 .../FinCollectionConfirmationService.java              |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 9da257a02a..ab0345a262 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1602,11 +1602,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
         String idNo = crmCustomerTempVo.getIDNumber();
         //身份证号
-        if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
-            if (StringUtils.isBlank(idNo)) {
-                return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+        //生成合同时如果为个人时，证件证号全款不是必须的、贷款必须。企业的证件号码不必须。
+        if("2".equals(appOrderDetailsVo.getPayTypeKey())){
+            if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
+                if (StringUtils.isBlank(idNo)) {
+                    return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+                }
             }
         }
+
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index 3dfd65ced5..9a38f29ced 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -68,7 +68,9 @@
             <if test="name != null and name != ''">
                 and concat(IFNULL(bo.customerName
                   , '')
-                  , ifnull(bo.billNo
+                  ,IFNULL(bo.staffName
+                , '')
+                , ifnull(bo.billNo
                   , '')) LIKE concat('%'
                   , #{name}
                   , '%')
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 3d43cc1a15..2f8bb99a49 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -1310,7 +1310,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //推送收款单
         ARReceivebill arReceivebill = new ARReceivebill();
         //业务日期
-        arReceivebill.setFDATE(DateUtil.today());
+//        arReceivebill.setFDATE(DateUtil.today());
+        arReceivebill.setFDATE(confirmation.getCreateDate());//收款日期
         //收款组织
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
         BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getPurchaseSystemSid()).getData();

From db66785ed4f1d1caa1d930f12805fbee38152cba Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 2 Mar 2023 18:01:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java                 | 8 +++++---
 .../anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 2f8bb99a49..1edfeea90e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -648,7 +648,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (listResultBean.getSuccess()) {
             for (CommonAppendixVo commonApp : listResultBean.getData()) {
                 FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
-                commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
+                //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
                 BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo);
                 paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
             }
@@ -662,7 +662,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (listResultBean.getSuccess()) {
             for (CommonAppendixVo commonApp : listResultBean.getData()) {
                 FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
-                commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
+                //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
                 BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo);
                 remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
             }
@@ -2011,7 +2011,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             FinCollectionConfirmationMaterial finCollectionConfirmationMaterial = new FinCollectionConfirmationMaterial();
             id = id + 1;
             //主车物料编码
-            finCollectionConfirmationMaterial.setVinNo(finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8));
+            if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getVIN())){
+                finCollectionConfirmationMaterial.setVinNo(finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8));
+            }
             finCollectionConfirmationMaterial.setId(String.valueOf(id));
             finCollectionConfirmationMaterial.setCname(finSelectedReceivablesDetailedVo.getCustomerName());
             finCollectionConfirmationMaterial.setPhone(finSelectedReceivablesDetailedVo.getCustomerPhone());
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java
index 0dd916620f..d8d0e3726b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java
@@ -107,8 +107,8 @@ public class CNBankcntService extends FinKingDeeService {
      * @throws Exception
      */
     private JSONObject view(String bankName) throws Exception {
-        String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.CN_BANKACNT.getID(), bankName);
-        ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), getKDForNumbers,
+        String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_BANK.getID(), bankName);
+        ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_BANK.getID(), getKDForNumbers,
                 kingDeeConfig.getUserName_administrator(),kingDeeConfig.getPassword_administrator(), KingDeeBillUrl.VIEW_URL.getURL());
         log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
         JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString());