Merge remote-tracking branch 'origin/master'

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)) {
+        if("2".equals(appOrderDetailsVo.getPayTypeKey())){
-                return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+            if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
+                if (StringUtils.isBlank(idNo)) {
+                    return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+                }
             }
         }
+
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称

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}
                   , '%')

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);
             }
@@ -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();
@@ -2010,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());

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);
+        String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_BANK.getID(), bankName);
-        ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), getKDForNumbers,
+        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());