Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -35,7 +35,8 @@ public enum BillTypeEnum {
     XXTHS("XXTHS", "销售退货单"),
     JCZLQRD("JCZLQRD", "交车资料确认单"),
     JCECQRD("JCECQRD", "交车资料二次确认单"),
-    HKSQ("HKSQ", "划扣申请单据编号");
+    HKSQ("HKSQ", "划扣申请单据编号"),
+    FKCEQRSQ("FKCEQRSQ", "放款差额确认申请");
 
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -120,6 +120,8 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey().equals(operateType)){
                     //领票申请通过后，修改发票状态为1
                     baseVehicleState.setInvoiceState("1");
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey().equals(operateType)){
+                    baseVehicleState.setManageState("1");
                 }
                 baseMapper.updateById(baseVehicleState);
             } else {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java

@@ -14,5 +14,7 @@ public class LoanOtherReceivablePush {
     private String borrowerSid;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
+    @ApiModelProperty("消贷合同sid")
+    private String loanContractSid;
     private String isCompInvoic;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -152,4 +152,9 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/selbyContractSid")
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> selbyContractSid(@RequestParam("loanContractSid") String loanContractSid);
+
+    @ApiOperation("根据贷款人sid查询车辆")
+    @GetMapping("/selectByBorrowerSid")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -148,4 +148,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -1141,6 +1141,16 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                     } else {
                         appCarListVo.setShowHandCarBtn(true);
                     }
+                    //根据合同和车辆sid获取欠款开票的信息
+                    BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
+                    if(busBillApplication != null){
+                        appCarListVo.setQkKpSid(busBillApplication.getSid());
+                        //根据欠款开票的编号查询
+                        FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
+                        if(finBillApplication != null){
+                            appCarListVo.setQkLpSid(finBillApplication.getSid());
+                        }
+                    }
                     //优惠包使用情况
                     List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
                     List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -104,6 +104,7 @@ import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService;
 import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
 import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
@@ -1245,6 +1246,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appMap.put("outboundSid", bv.getBusinessSid());
         appMap.put("contractId", busDeliveredApply.getContractNo());
         appMap.put("contract_id", busDeliveredApply.getContractNo());
+        appMap.put("type", 2);
         variables.put("app", appMap);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
         flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@@ -4568,6 +4570,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 } else {
                     appCarListVo.setShowHandCarBtn(false);
                 }
+                //根据合同和车辆sid获取欠款开票的信息
+                BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
+                if(busBillApplication != null){
+                    appCarListVo.setQkKpSid(busBillApplication.getSid());
+                    //根据欠款开票的编号查询
+                    FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
+                    if(finBillApplication != null){
+                        appCarListVo.setQkLpSid(finBillApplication.getSid());
+                    }
+                }
 
                 //优惠包使用情况
                 List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -49,10 +49,16 @@ import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
 import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
@@ -110,11 +116,17 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    private DictCommonFeign dictCommonFeign;
+    @Autowired
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private LoanFinPolicyFeign loanFinPolicyFeign;
+    @Autowired
+    private LoanFinBankFeign loanFinBankFeign;
 
     private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -364,7 +376,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 //-----------获取其他应收单对象----------------
                 CapitalCreditResult creditResult = new CapitalCreditResult();
                 //根据销售订单的贷款人sid查询车辆表中的数据
-                List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(borrowerSid, saleOrderSid);
+                List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSidAndXdConSid(saleOrderSid, loanOtherReceivablePush.getLoanContractSid());
                 if (!busSalesOrderVehicleList.isEmpty()) {
                     for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicleList) {
                         String customerNumber = "";
@@ -398,9 +410,15 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             customerNumber = busSalesOrderVehicle.getTemporaryNo();
                         }
                         creditResult.setCommUnit(customerNumber);
-                        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
-                        creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                        creditResult.setCollectionOrg(basePurchaseSystemDetailsVo.getOrgCode());
                         creditResult.setBussDate(DateUtil.formatDate(new Date()));
+                        SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
+                        if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicySid())){
+                            LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData();
+                            LoanFinBankVo loanFinBankVo = loanFinBankFeign.details(loanFinPolicyVo.getBankSid()).getData();
+                            creditResult.setBankName(loanFinBankVo.getBankNo());
+                        }
                         List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
                         SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(salesOrder.getOrgSid()).getData();
                         //这是生成业务系统融资放款应收的逻辑：
@@ -412,6 +430,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                             creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
                             creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
+                            DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.RONGZI_FANGKUAN.getType(), "YT").getData();
+                            creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                             collectionDetailDtoListOne.add(creditResultDetailDto);
                         }
                         SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
@@ -424,6 +444,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney(solutions.getTrailerAmount());
                                         creditResultDetailDto.setUseTo(CwSystemYT.GCDTK.getType());
+                                        DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.GCDTK.getType(), "YT").getData();
+                                        creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
                                 }
@@ -434,6 +456,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getBondAmounts());
                                 creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.BOND_AMOUNTS.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //保险保证金
@@ -442,6 +466,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getDepositPremium());
                                 creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_PREMIUM.getType());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_PREMIUM.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //落户保证金
@@ -450,6 +476,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getDepositSettle());
                                 creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_SETTLE.getType());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_SETTLE.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //服务费
@@ -458,6 +486,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setUseTo(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType());
                                 creditResultDetailDto.setExTaxMoney(solutions.getServiceAmount());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //代收意外险
@@ -466,6 +496,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
                                 creditResultDetailDto.setExTaxMoney(solutions.getProxyAccidentPremium());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //上牌费、运管费
@@ -478,6 +510,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setUseTo(CwSystemYT.SHANGPAI_YUNGUAN.getType());
                                 creditResultDetailDto.setExTaxMoney(add.toString());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SHANGPAI_YUNGUAN.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //其它费用
@@ -486,6 +520,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getOtherAmount());
                                 creditResultDetailDto.setUseTo(CwSystemYT.OTHER_AMOUNT.getType());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.OTHER_AMOUNT.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //补车价
@@ -494,6 +530,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getVehOtherPrice());
                                 creditResultDetailDto.setUseTo(CwSystemYT.VEH_OTHER_PRICE.getType());
+                                DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.VEH_OTHER_PRICE.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //留购价
@@ -502,6 +540,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
                                 creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
+                                 DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.NOMINAL_PRICE.getType(), "YT").getData();
+                                creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }*/
                         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -171,4 +171,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     @Select("select * from bus_sales_order_vehicle where loanContractSid = #{loanContractSid}")
     List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid);
+
+    @Select("select * from bus_sales_order_vehicle where borrowerSid = #{borrowerSid}")
+    List<BusSalesOrderVehicle> selectByBorrowerSid(String borrowerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -168,4 +168,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(loanContractSid);
         return rb.success().setData(busSalesOrderVehicles);
     }
+
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
+        return busSalesOrderVehicleService.selectByBorrowerSid(borrowerSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -639,4 +639,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid) {
         return baseMapper.selByLoanContractSid(loanContractSid);
     }
+
+    public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderVehicle> busSalesOrderVehicleList = baseMapper.selectByBorrowerSid(borrowerSid);
+        return rb.success().setData(busSalesOrderVehicleList);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java

@@ -28,6 +28,8 @@ public class CapitalCreditResult {
     public String currency = "PRE001";
     @ApiModelProperty("业务日期")
     public String bussDate;
+    @ApiModelProperty("银行")
+    public String bankName;
     @ApiModelProperty("收款明细")
     public List<CapitalCreditResult.CapitalCreditResultDetailDto> resultDetails;
 
@@ -43,5 +45,7 @@ public class CapitalCreditResult {
         public String exTaxMoney;
         @ApiModelProperty("用途")
         public String useTo;
+        @ApiModelProperty("备注")
+        public String remarks;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -704,20 +704,23 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
         if (finBillTrailerVos.size() > 0) {
             for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
-                FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
-                finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
-                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
-                List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
-                List<String> hgzImageUrls = new ArrayList<>();
-                for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
-                        hgzImageUrls.add(commonAppendixVo.getFileUrl());
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    if (finBillTrailerVo.getVinNo().equals(finBillVehicleVo.getVinNo())){
+                        finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
+                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
+                        List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
+                        List<String> hgzImageUrls = new ArrayList<>();
+                        for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+                            if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
+                                hgzImageUrls.add(commonAppendixVo.getFileUrl());
+                            }
+                        }
+                        finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
+                        if (finBillTrailerVo.getOneBillMoney() == null) {
+                            finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
+                        }
                     }
                 }
-                finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
-                if (finBillTrailerVo.getOneBillMoney() == null) {
-                    finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
-                }
             }
             vo.setFinBillTrailers(finBillTrailerVos);
         }
@@ -923,6 +926,31 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     busValcustFilingDto.setBusSid(finBillApplication.getSid());
                     busValcustFilingDto.setBusSource("0");
                     busValcustFilingFeign.save(busValcustFilingDto);
+                    //获取销售专员userSid
+                    List<String> receIveUserSidList = new ArrayList<>();
+                    SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+                    receIveUserSidList.add(sysUserVo.getSid());
+                    //发送通知给销售专员
+                    try {
+                        ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                                .setNameFormat("demo-pool-%d").build();
+                        ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                                1000, TimeUnit.MILLISECONDS,
+                                new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                        Future future1 = pool.submit(() -> {
+                            PushMessageQuery pushMessageQuery = new PushMessageQuery();
+                            pushMessageQuery.setReceivedSids(receIveUserSidList);
+                            pushMessageQuery.setModuleName("业务");
+                            pushMessageQuery.setMsgContent("提醒：请对" + busSalesOrder.getContractNo() + "的开票申请进行价值客户备案。");
+                            pushMessageQuery.setApp_type("2");
+                            pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
+                            pushMessageQuery.setMsgTitle("价值客户备案提醒");
+                            // 消息推送
+                            messageFeign.pushNoUriMessage(pushMessageQuery);
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 } else {//不是高低开
                     for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                         int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
@@ -1391,6 +1419,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        finBillApplication = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -2662,6 +2691,31 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             busValcustFilingDto.setBusSid(finBillApplication.getSid());
                             busValcustFilingDto.setBusSource("0");
                             busValcustFilingFeign.save(busValcustFilingDto);
+                            //获取销售专员userSid
+                            List<String> receIveUserSidList = new ArrayList<>();
+                            SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+                            receIveUserSidList.add(sysUserVo.getSid());
+                            //发送通知给销售专员
+                            try {
+                                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                                        .setNameFormat("demo-pool-%d").build();
+                                ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                                        1000, TimeUnit.MILLISECONDS,
+                                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                                Future future1 = pool.submit(() -> {
+                                    PushMessageQuery pushMessageQuery = new PushMessageQuery();
+                                    pushMessageQuery.setReceivedSids(receIveUserSidList);
+                                    pushMessageQuery.setModuleName("业务");
+                                    pushMessageQuery.setMsgContent("提醒：请对" + busSalesOrder.getContractNo() + "的开票申请进行价值客户备案。");
+                                    pushMessageQuery.setApp_type("2");
+                                    pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
+                                    pushMessageQuery.setMsgTitle("价值客户备案提醒");
+                                    // 消息推送
+                                    messageFeign.pushNoUriMessage(pushMessageQuery);
+                                });
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                         }else{
                             int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
                             if (count == 0) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1708,6 +1708,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             loanDiffsDto.setCreateDeptSid(confirmation.getCreateDeptSid());
             loanDiffsDto.setUseOrgSid(confirmation.getUseOrgSid());
             loanDiffsDto.setCreateDept(confirmation.getCreateDept());
+            loanDiffsDto.setOrgSidPath(confirmation.getOrgSidPath());
             List<LoanDiffDetailssDto> loanDiffDetailssDtos = new ArrayList<>();
             //根据车辆sid查询金融方案
             for (int i = 0; i < finLi.size(); i++) {
@@ -1722,19 +1723,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 LoanFinOtherPolicy loanFinOtherPolicy = null;
                 boolean isTue = false;
                 if(loanSolutions != null){
+                    loanSolutionsDetail = baseMapper.selectByLoanSid(loanSolutions.getSid());
+                    loanSolutionsOtherpolicy = baseMapper.selectBySoluSid(loanSolutions.getSid());
                     if (loanSolutionsDetail.getBondAmounts() != null) {
                         bigAdd = bigAdd.add(loanSolutionsDetail.getBondAmounts());
                     }
                     if(loanSolutions.getFactoryDiscount() != null){
                         bigAdd = bigAdd.add(loanSolutions.getFactoryDiscount());
                     }
-                    loanSolutionsOtherpolicy = baseMapper.selectBySoluSid(loanSolutions.getSid());
+
                     if(loanSolutionsOtherpolicy != null){
                         if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
                             bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherDiscount());
                         }
                     }
-                    loanSolutionsDetail = baseMapper.selectByLoanSid(loanSolutions.getSid());
+
                     if(loanSolutionsDetail != null){
                         if(loanSolutionsDetail.getProxyAccidentPremium() != null){
                             bigAdd = bigAdd.add(loanSolutionsDetail.getProxyAccidentPremium());
@@ -1775,6 +1778,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 loanDiffDetailssDto.setVinSid(busSalesOrderVehicle.getLinkSid());
                                 loanDiffDetailssDto.setBusVinSid(busSalesOrderVehicle.getSid());
                                 loanDiffDetailssDtos.add(loanDiffDetailssDto);
+                                loanDiffsDto.setLoanDiffDetailssDtos(loanDiffDetailssDtos);
                             }
                         }
                     }else{
@@ -1795,6 +1799,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             loanDiffDetailssDto.setVinSid(busSalesOrderVehicle.getLinkSid());
                             loanDiffDetailssDto.setBusVinSid(busSalesOrderVehicle.getSid());
                             loanDiffDetailssDtos.add(loanDiffDetailssDto);
+                            loanDiffsDto.setLoanDiffDetailssDtos(loanDiffDetailssDtos);
                         }else{
                             CapitalCreditResult creditResult = new CapitalCreditResult();
                             //推送其他应收单
@@ -1828,8 +1833,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 customerNumber = busSalesOrderVehicle.getTemporaryNo();
                             }
                             creditResult.setCommUnit(customerNumber);
-                            SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(busSalesOrder.getUseOrgSid()).getData();
-                            creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                            BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(busSalesOrder.getPurchaseSystemSid()).getData();
+                            creditResult.setCollectionOrg(basePurchaseSystemDetailsVo.getOrgCode());
                             creditResult.setBussDate(DateUtil.formatDate(new Date()));
                             List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
                             SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java

@@ -59,6 +59,8 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
         map_fEntityModel_.put("FSALEDEPTID", creditResult.getResultDetails().get(0).getDearDept());
         //申请部门
         map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept());
+        //银行
+        map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName());
         List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails();
         //准备 物料列表的数据
         ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);
@@ -73,9 +75,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
                 return rb.setMsg("其他应收单保存失败!");
             }
             log.info("其他应收单保存成功!");
-            String submitKD = getSubmitKD(resultBean1.getData(),KingDeeBillId.AR_OTHERRECEIVABLE.getID());
+            String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
             ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
-            if(!resultBean2.getSuccess()){
+            if (!resultBean2.getSuccess()) {
                 log.info("其他应收单提交失败!");
                 return rb.setMsg("其他应收单提交失败!");
             }
@@ -101,6 +103,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
             m.put("FCOSTDEPARTMENTID", c.getDearDept());
             m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
             m.put("F_PAEZ_Assistant1", c.getUseTo());
+            m.put("FCOMMENT",c.getRemarks());
             collectionDetailMap.add(m);
         }
         return rb.success().setData(collectionDetailMap);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json

@@ -25,7 +25,7 @@
   "F_PMZC_Assistant2": {
     "FNumber": ""
   },
-  "FCOMMENT": "",
+  "FCOMMENT": "@KD_FCOMMENT",
   "FSourceBillNo": "",
   "FCREATEINVOICE": "false",
   "FIVAmountFor": "0",

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json

@@ -55,7 +55,7 @@
     "FNUMBER": ""
   },
   "F_PAEZ_Base": {
-    "FNUMBER": ""
+    "FNUMBER": "@KD_F_PAEZ_Base"
   },
   "F_PAEZ_Base1": {
     "FNUMBER": ""

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -716,6 +716,9 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             Map<String, Object> flowMap = f.getProcessVariables();
             f.setBusinessSid(flowMap.get("businessSid").toString());
             Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
+            if("process_161otrwo:2:5642504".equals(proDefId)){
+                appMap.put("type",2);
+            }
             String json = JSONObject.toJSONString(appMap);
             AppVo appVo = new AppVo();
             appVo.setJson(json);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffsDto.java

@@ -27,6 +27,8 @@ public class LoanDiffsDto implements Dto {
     private String createDept;
     @ApiModelProperty("申请部门sid")
     private String createDeptSid;
+    @ApiModelProperty("orgPath")
+    private String orgSidPath;
 
     private List<LoanDiffDetailssDto> loanDiffDetailssDtos;
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java

@@ -30,4 +30,6 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo {
     private List<String> guarantorAccount;
     @ApiModelProperty("是否有配偶")
     private Boolean spouseState = false;
+    @ApiModelProperty("是否有担保人")
+    private Boolean dbrState = false;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -234,6 +234,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
             BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
             loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            loanOtherReceivablePush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
             String borrowerSid = "";
             if (loancontractDetailsVo != null) {
                 loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
@@ -267,7 +268,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             for (BusSalesOrderVehicle salesOrderVehicle : busSalesOrderVehicles) {
                 vinNo = vinNo + salesOrderVehicle.getLinkNo().substring(salesOrderVehicle.getLinkNo().length() - 8) + "、";
             }
-            vinNo = vinNo.substring(vinNo.lastIndexOf("、"));
+            vinNo = vinNo.substring(0, vinNo.lastIndexOf("、"));
             //发送通知给销售专员
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java

@@ -27,4 +27,6 @@ public interface LoanDiffMapper extends BaseMapper<LoanDiff> {
     BusSalesOrderVehicle selectByBusVinSid(String busVinSid);
 
     BusSalesOrder selectByOrderSid(String salesOrderSid);
+
+    String selectNum(String bill);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml

@@ -44,4 +44,12 @@
     <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
         select * from anrui_buscenter.bus_sales_order where sid = #{salesOrderSid}
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from loan_diff
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+        limit 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@@ -9,6 +9,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -26,6 +29,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loandiff.*;
@@ -89,6 +93,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
      * 判断提交的流程是否被允许
@@ -280,8 +286,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     customerNumber = busSalesOrderVehicle.getTemporaryNo();
                 }
                 creditResult.setCommUnit(customerNumber);
-                SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(busSalesOrder.getUseOrgSid()).getData();
-                creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(busSalesOrder.getPurchaseSystemSid()).getData();
+                creditResult.setCollectionOrg(basePurchaseSystemDetailsVo.getOrgCode());
                 creditResult.setBussDate(DateUtil.formatDate(new Date()));
                 List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
                 SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
@@ -289,7 +295,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                     creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
-                    creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                    creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
                     collectionDetailDtoListOne.add(creditResultDetailDto);
                 }
                 if (loanDiffDetails.getRealityDiscount() != null) {//实扣主产品厂家贴息
@@ -317,7 +323,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                     creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
-                    creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                    creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
                     collectionDetailDtoListOne.add(creditResultDetailDto);
                 }
                 creditResult.setResultDetails(collectionDetailDtoListOne);
@@ -563,6 +569,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
         BeanUtil.copyProperties(dto, loanDiff);
         List<LoanDiffDetailssDto> loanDiffDetailssDtos = dto.getLoanDiffDetailssDtos();
         loanDiffDetailssDtos.removeAll(Collections.singleton(null));
+        String billNo =getApplyCode(loanDiff.getOrgSidPath());
+        loanDiff.setBillNo(billNo);
         if (!loanDiffDetailssDtos.isEmpty()) {
             for (int i = 0; i < loanDiffDetailssDtos.size(); i++) {
                 LoanDiffDetailssDto loanDiffDetailssDto = loanDiffDetailssDtos.get(i);
@@ -576,6 +584,25 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
         return rb.success();
     }
 
+    public String getApplyCode(String orgSidPath) {
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.FKCEQRSQ.getBillType());
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
     public ResultBean updateDiff(LoanDiffDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -29,11 +29,16 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto;
@@ -97,6 +102,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     @Autowired
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
     @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
+    @Autowired
     private MessageFeign messageFeign;
 
     public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
@@ -104,19 +113,28 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         QueryWrapper<LoanHomevisitFileexamine> qw = new QueryWrapper<>();
         qw.eq("li.state", 2);
         qw.eq("lf.state", query.getType());
-        if ("1".equals(query.getType())){
+        if ("1".equals(query.getType())) {
             qw.eq("bb.busNo", 303);
         }
         if (StringUtils.isNotBlank(query.getMenuUrl())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            privilegeQuery.setOrgPath(query.getOrgSidPath());
+            if (StringUtils.isNotBlank(query.getOrgSidPath())) {
+                privilegeQuery.setOrgPath(query.getOrgSidPath());
+            } else if (StringUtils.isNotBlank(query.getOrgPath())) {
+                privilegeQuery.setOrgPath(query.getOrgPath());
+            }
             privilegeQuery.setMenuUrl(query.getMenuUrl());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
                 //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                String orgSidPath = query.getOrgSidPath();
+                String orgSidPath = "";
+                if (StringUtils.isNotBlank(query.getOrgSidPath())) {
+                    orgSidPath = query.getOrgSidPath();
+                } else if (StringUtils.isNotBlank(query.getOrgPath())) {
+                    orgSidPath = query.getOrgPath();
+                }
                 orgSidPath = orgSidPath + "/";
                 int i1 = orgSidPath.indexOf("/");
                 int i2 = orgSidPath.indexOf("/", i1 + 1);
@@ -412,10 +430,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             }
         }
         this.updateByDto(dto);
-        if (!"1".equals(dto.getIsSave())){
+        if (!"1".equals(dto.getIsSave())) {
             LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getHomeVisitSid());
             List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByBorrowerSid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData();
-            if (busSalesOrderLoancontracts != null){
+            if (busSalesOrderLoancontracts != null) {
                 for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) {
                     LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto();
                     loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid());
@@ -424,6 +442,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
                     loanCapitalCreditResultService.saveOrUpdateDto(loanCapitalCreditResultDto);
                 }
             }
+            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitInvestigate.getSaleOrderSid(), loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData();
+            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+            for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey());
+                baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                dtoList.add(baseVehicleStateDto);
+            }
+            baseVehicleStateFeign.saveOrUpdate(dtoList);
         }
     }
 
@@ -440,7 +467,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         }
         LoanHomevisitFileexamine entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        if (!"1".equals(dto.getIsSave())){
+        if (!"1".equals(dto.getIsSave())) {
             entity.setState(2);
         }
         baseMapper.updateById(entity);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1007,24 +1007,32 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 loanHomeVisitInvestigateInitZMWJVo.setSpouseState(true);
             }
         }
-        //担保人身份证
-        List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
-        List<String> pohkbImage = new ArrayList<>();
-        if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
-            for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
-                pohkbImage.add(dbrsfzImage.getFileUrl());
-            }
-        }
-        loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage);
-        //担保人户口本
-        List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
-        List<String> guarantorAccount = new ArrayList<>();
-        if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
-            for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
-                guarantorAccount.add(dbrhkbImage.getFileUrl());
+        List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
+        if (loanHomeVisitInvestigateInitOtherPeoVos != null &&  loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){
+            for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
+                if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())){
+                    //担保人身份证
+                    List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+                    List<String> pohkbImage = new ArrayList<>();
+                    if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
+                        for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
+                            pohkbImage.add(dbrsfzImage.getFileUrl());
+                        }
+                    }
+                    loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage);
+                    //担保人户口本
+                    List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
+                    List<String> guarantorAccount = new ArrayList<>();
+                    if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
+                        for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
+                            guarantorAccount.add(dbrhkbImage.getFileUrl());
+                        }
+                    }
+                    loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
+                    loanHomeVisitInvestigateInitZMWJVo.setDbrState(true);
+                }
             }
         }
-        loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
         loanHomeVisitInvestigateInitZMWJVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -362,10 +362,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         String urlAllVo = "";
         List<File> filesList = new ArrayList<>();
         //贷款人生成车辆买卖合同
-        List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
+        /*List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
         for (File xcmmContractUrl : xcmmContractUrls) {
             filesList.add(xcmmContractUrl);
-        }
+        }*/
         if (conSetUpKey.equals("001")) {//一车一合同
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -392,7 +392,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setBusName("资方终审确认");
                 String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
-                //生成车辆融资协议
+               /* //生成车辆融资协议
                 String clrzxyUrl = generateCLRZXY(printConfirmDto);
                 //生成还款协议
                 String hkxyUrl = hkxy(printConfirmDto);
@@ -421,7 +421,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 if (StringUtils.isNotBlank(gsgddwdbjy)) {
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                     filesList.add(file);
-                }
+                }*/
             }
         } else if (conSetUpKey.equals("002")) {//一人一合同
             List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -452,7 +452,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
-            //生成车辆融资协议
+            /*//生成车辆融资协议
             String clrzxyUrl = generateCLRZXY(printConfirmDto);
             //生成还款协议
             String hkxy = hkxy(printConfirmDto);
@@ -481,7 +481,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             if (StringUtils.isNotBlank(gsgddwdbjy)) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                 filesList.add(file);
-            }
+            }*/
         }
         //合并pdf文件
         if (filesList.size() > 0) {
@@ -709,9 +709,23 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 map.put("df","☑");
             }
             //连带还款责任 □丙方、 □丁方、 □戊方、 □己方为连带还款人
-            map.put("bf","□");
-            map.put("mf","□");
-            map.put("yfwldhk","□");
+            if (StringUtils.isNotBlank(homeKcCust.getSpouseName())){
+                map.put("bf","☑");
+            }else {
+                map.put("bf","□");
+            }
+            String partyE = (String) map.get("partyE");
+            if (StringUtils.isNotBlank(partyE)){
+                map.put("mf","☑");
+            }else {
+                map.put("mf","□");
+            }
+            String partyF = (String) map.get("partyF");
+            if (StringUtils.isNotBlank(partyF)){
+                map.put("yfwldhk","☑");
+            }else {
+                map.put("yfwldhk","□");
+            }
             if ("0".equals(homeKcCust.getIsSecurity())){
                 map.put("dfTwo","☑");
             }else if ("1".equals(homeKcCust.getIsSecurity())){

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -153,6 +153,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             //推送其他应收单
             LoanNoGuaranteeCreditReview creditReview = fetchBySid(sid);
             if (null != creditReview) {
+                //家访考察通过后修改车辆业务状态中的资方终审为1.
+                if (StringUtils.isNotBlank(creditReview.getHomeVisit())){
+                    List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectByBorrowerSid(borrowerSid).getData();
+                    for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+                        baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getSid());
+                    }
+                }
                 if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
                     if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(result)) {
                         BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
@@ -176,10 +183,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
                             ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
                         }
                         //资方信审终审通过后修改车辆业务状态中的资方终审为1.
-                        ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+                        /*ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
                         if (busSalesOrderVehicle.getData() != null) {
                             ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
-                        }
+                        }*/
                     }
                 }
             }
@@ -206,6 +213,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             //推送其他应收单
             LoanNoGuaranteeCreditReview creditReview = fetchBySid(sid);
             if (null != creditReview) {
+                //家访考察通过后修改车辆业务状态中的资方终审为1.
+                if (StringUtils.isNotBlank(creditReview.getHomeVisit())){
+                    List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectByBorrowerSid(borrowerSid).getData();
+                    for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+                        baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getSid());
+                    }
+                }
                 if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
                     if ("通过".equals(creditReview.getCreditReview())) {
                         BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
@@ -229,10 +243,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
                             ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
                         }
                         //资方信审终审通过后修改车辆业务状态中的资方终审为1.
-                        ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+                        /*ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
                         if (busSalesOrderVehicle.getData() != null) {
                             ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
-                        }
+                        }*/
                     }
                 }
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -1224,19 +1224,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             return rb.setMsg("请先选择产品政策");
         }
         String busSid = query.getSalesOrderSid();
-        LoanSolutions loanSolutions = baseMapper.selectByBusSid(busSid);
+//        LoanSolutions loanSolutions = baseMapper.selectByBusSid(busSid);
         boolean isOrder = false;
         BigDecimal orderPrice = BigDecimal.ZERO;
-        if(loanSolutions != null){//销售订单
-            BusSalesOrder busSalesOrder = baseMapper.seletByBusSids(busSid);
-            if(busSalesOrder != null){
-                isOrder = true;
-                BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPriceSid(busSid);
-                if(busSalesOrderPrice == null){
-                    return rb.setMsg("请先录入价格信息");
-                }
-                orderPrice = busSalesOrderPrice.getSingleFinalPrice();
+        BusSalesOrder busSalesOrder = baseMapper.seletByBusSids(busSid);
+        if(busSalesOrder != null){
+            isOrder = true;
+            BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPriceSid(busSid);
+            if(busSalesOrderPrice == null){
+                return rb.setMsg("请先录入价格信息");
             }
+            orderPrice = busSalesOrderPrice.getSingleFinalPrice();
         }
         CalculateVo calculateVo = new CalculateVo();
         //计算的初始化
@@ -1385,7 +1383,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             calculateVo.setLoanInterest(loanInterestNew.toString());
             calculateVo.setPolicyYearRatio(policyYearRatioNew.toString());
             calculateVo.setLoanPayMoney(loanPayMoneyNew.toString());
-            String actualDiscountString = actualDiscount.setScale(0, BigDecimal.ROUND_HALF_UP).toString();
+            String actualDiscountString = actualDiscount.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
             calculateVo.setActualDiscount(actualDiscountString);
         } else {
             //年利率
@@ -1480,7 +1478,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 calculateVo.setOtherPolicyInterest(otherPolicyInterestNew.toString());
                 calculateVo.setOtherPolicyYearRatio(otherPolicyYearRatioNew.toString());
                 calculateVo.setOtherPolicyMonthlyRepay(otherPolicyMonthlyRepayNew.toString());
-                String otherActualDiscountString = otherActualDiscount.setScale(0, BigDecimal.ROUND_HALF_UP).toString();
+                String otherActualDiscountString = otherActualDiscount.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
                 calculateVo.setOtherActualDiscount(otherActualDiscountString);
             } else {
                 loanDownPay = loanDownPay.subtract(new BigDecimal(otherPolicyAmount));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -217,13 +217,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             inboundVehicle.setOrgSidPath(orgPath);
             inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
 
-            if (StringUtils.isNotBlank(dto.getLogo())) {
+            /*if (StringUtils.isNotBlank(dto.getLogo())) {
                 if (dto.getLogo().equals("1")) {
                     inboundVehicle.setOrgPriceDate("");
                 }
             } else {
                 inboundVehicle.setOrgPriceDate(DateUtil.formatDate(new Date()));
-            }
+            }*/
+            inboundVehicle.setOrgPriceDate("");
             save(inboundVehicle);
             String num = dto.getNum();
             if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@@ -1026,7 +1027,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        int vinCount = 0;
+        if (StringUtils.isBlank(dto.getOrgPriceDate())){
+            return new ResultBean().fail().setMsg("公司入库日期不能为空");
+        }
+        /*int vinCount = 0;
         if (!vehicleList.isEmpty()) {
             for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
                 if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo()) && StringUtils.isNotBlank(scmApplyInboundVehicleDto.getEngineNo())) {
@@ -1037,7 +1041,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (vinCount < Integer.parseInt(num)) {
             dto.setOrgPriceDate("");
             dto.setLogo("1");
-        }
+        }*/
         if (StringUtils.isBlank(busSid)) {
             ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
             if (!resultBean.getSuccess()) {
@@ -1051,7 +1055,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 String vinNo = scmApplyInboundVehicleDto.getVinNo();
                 if (StringUtils.isBlank(vinNo)) {
                     scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
-                    BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto);
+                    BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto, "orgPriceDate");
                     scmApplyInboundDto.setSid(null);
                     scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
                 }