修改单车预提推凭证9

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -107,6 +107,12 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/createjrbjdPdf")
     @ResponseBody
     public ResultBean<PdfPath> createjrbjdPdf(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据车辆sid查询财务客户编码")
+    @PostMapping("/selectCwCustomerNoByVinSid")
+    @ResponseBody
+    public String selectCwCustomerNoByVinSid(@RequestParam("vinSid") String vinSid);
+
 }
 
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
 import com.yxt.anrui.base.api.basevehicleout.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -51,4 +50,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     List<BaseSalesReturnVo> selectByVehReturn(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo);
 
     void deleteByVehReturn(@Param("vinSid") String vinSid, @Param("mainSid") String mainSid);
+
+    String selectCwCustomerNoByVinSid(@Param("vinSid")String vinSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -245,6 +245,16 @@
         WHERE bv.vinSid = #{vinSid}
           AND ba.contractNo = #{contractNo}
     </select>
+    <select id="selectCwCustomerNoByVinSid" resultType="java.lang.String">
+        SELECT
+            o.cwCustomerNo
+        FROM
+            base_vehicle_out AS o
+                LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
+        WHERE o.vinSid = #{vinSid}
+        ORDER BY a.makeListDate DESC
+            LIMIT 1
+    </select>
 
 
     <update id="deleteByVehReturn">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -149,4 +148,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
         }
         return rb.success().setData(pdf);
     }
+
+    @Override
+    public String selectCwCustomerNoByVinSid(String vinSid) {
+        return baseVehicleOutService.selectCwCustomerNoByVinSid(vinSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2785,4 +2785,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
         return dateStr + "/" + pdfName;
     }
+
+    public String selectCwCustomerNoByVinSid(String vinSid) {
+        return baseMapper.selectCwCustomerNoByVinSid(vinSid);
+    }
 }

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

@@ -37,7 +37,6 @@ import com.yxt.anrui.base.api.basetrailer.*;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
-import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.CertificateStateQuery;
@@ -52,17 +51,14 @@ import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.CertificState;
 import com.yxt.anrui.base.common.utils.Rule;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo;
-import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto;
 import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationVo;
 import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo;
 import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicle;
 import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
-import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
 import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
@@ -113,25 +109,22 @@ 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.FinBillTrailerFeign;
-import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
-import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDetailsVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -156,10 +149,8 @@ import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
 import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign;
-import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
@@ -171,7 +162,10 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import com.yxt.messagecenter.api.message.PushMessageQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.slf4j.Logger;
@@ -303,7 +297,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusSalesOrderTrailerService busSalesOrderTrailerService;
     @Autowired
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
-
+    @Autowired
+    private FinKingDeeFeign finKingDeeFeign;
     /**
      * 构造出库申请的查询条件
      *
@@ -1198,6 +1193,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                     Future future11 = pool.submit(() -> {
                                         pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
                                     });
+                                    Future future12 = pool.submit(() -> {
+                                        pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
+                                    });
                                 }
                             }
                         }
@@ -1362,6 +1360,56 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
     }
 
+    private void pushVehRebateAdjustBill(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList,SolutionsDetailsVo solutionsDetailsVo) {
+        BigDecimal cjtx = BigDecimal.ZERO;//厂家贴息
+        BigDecimal txdck = BigDecimal.ZERO;//贴息抵车款
+        if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
+            cjtx = new BigDecimal(solutionsDetailsVo.getFactoryDiscount());
+        }
+        if (StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())) {
+            txdck = new BigDecimal(solutionsDetailsVo.getDiscountCar());
+        }
+        if (cjtx.compareTo(txdck) > 0) {
+            BigDecimal pushMoney = cjtx.subtract(txdck);
+            CostAdjustmentsBill costAdjustmentsBill = new CostAdjustmentsBill();
+            costAdjustmentsBill.setBussDate(DateUtil.formatDate(new Date()));
+            List<CostAdjustmentsBill.CostAdjustmentsBillDetailDto> resultDetails = new ArrayList<>();
+            String useOrgCode = "";
+            if (StringUtils.isNotBlank(busDeliveredApply.getUseOrgSid())) {
+                String useOrgSid = busDeliveredApply.getUseOrgSid();
+                SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                if (null != organizationVo) {
+                    costAdjustmentsBill.setUseOrgCode(organizationVo.getOrgCode());
+                    useOrgCode = organizationVo.getOrgCode();
+                }
+            }
+            for (BusDeliveredApplyDetails d : detailsList) {
+                BaseVehicle vehicle = baseVehicleFeign.fetchBySid(d.getVinSid()).getData();
+                if (null != vehicle) {
+                    costAdjustmentsBill.setCommUnit(vehicle.getManufacturerCode());
+                    String vinCode = "";
+                    String deptCode = "";
+                    SysOrganizationVo data = sysOrganizationFeign.fetchBySid(vehicle.getPurchaseSystemSid()).getData();
+                    if (null != data) {
+                        deptCode = data.getOrgCode();
+                    }
+                    vinCode = vehicle.getVinNo().substring(vehicle.getVinNo().length() - 8);
+                    //添加成本调整单
+                    CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto();
+                    dto.setCompanyCode(useOrgCode);
+                    dto.setMaterialID(vinCode);
+                    dto.setDeptCode(deptCode);
+                    dto.setAmount(pushMoney.negate().toString());
+                    resultDetails.add(dto);
+                }
+            }
+            if (!resultDetails.isEmpty()) {
+                costAdjustmentsBill.setResultDetails(resultDetails);
+                finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
+            }
+        }
+    }
+
     private void pushVehRebate(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList, String factoryDiscount) {
         for (BusDeliveredApplyDetails busDeliveredApplyDetails : detailsList) {
             ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
@@ -1631,6 +1679,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                     Future future11 = pool.submit(() -> {
                                         pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
                                     });
+                                    Future future12 = pool.submit(() -> {
+                                        pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
+                                    });
                                 }
                             }
                         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
@@ -41,7 +42,6 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
@@ -113,6 +113,9 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceAdjustApplyMapper, ScmFinanceAdjustApply> {
+
+    @Autowired
+    private BaseVehicleOutFeign baseVehicleOutFeign;
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
@@ -205,6 +208,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
         qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (a.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(closingEndDate), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("a.id");
         IPage<ScmFinanceAdjustApply> page = PagerUtil.queryToPage(pq);
         IPage<ScmFinanceAdjustApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmFinanceAdjustApplyVo> p = PagerUtil.pageToVo(pagging, null);
@@ -769,11 +773,9 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
                                     vinCode = vehicle.getVinNo().substring(vehicle.getVinNo().length() - 8);
                                     voucherDetail.setMaterial(vinCode);
                                 }
-                                if (StringUtils.isNotBlank(rebate.getCustomerSid())) {
+                                String cwCustomerNo = baseVehicleOutFeign.selectCwCustomerNoByVinSid(rebate.getVehSid());
-                                    CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(rebate.getCustomerSid()).getData();
+                                if (StringUtils.isNotBlank(cwCustomerNo)) {
-                                    if (null != customerTemp) {
+                                    voucherDetail.setCustomerCode(cwCustomerNo);
-                                        voucherDetail.setCustomerCode(customerTemp.getCustomerNo());
-                                    }
                                 }
                                 if (null != rebate.getNowAdjustmentMoney()) {
                                     if (rebate.getNowAdjustmentMoney().compareTo(BigDecimal.ZERO) > 0) {
@@ -781,7 +783,6 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
                                         voucherDetails.add(voucherDetail);
                                     }
                                 }
-
                                 //生成应收
                                 if (null != salesOrder) {
                                     FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustdetails/ScmFinanceAdjustDetailsService.java

@@ -140,6 +140,7 @@ public class ScmFinanceAdjustDetailsService extends MybatisBaseService<ScmFinanc
 		if (StringUtils.isNotBlank(query.getRemarks())) {
 			qw.like("d.remarks",query.getRemarks());
 		}
+		qw.orderByDesc("a.id");
 		IPage<ScmFinanceAdjustDetails> page = PagerUtil.queryToPage(pq);
 		IPage<ScmFinanceAdjustDetailsVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<ScmFinanceAdjustDetailsVo> p = PagerUtil.pageToVo(pagging, null);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -32,11 +32,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -108,6 +108,8 @@ import static java.util.Comparator.comparing;
 @Service
 public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehrebateCheckapplyMapper, ScmVehrebateCheckapply> {
 
+    @Autowired
+    private BaseVehicleOutFeign baseVehicleOutFeign;
     @Autowired
     private ScmVehRebateWithApplyService scmVehRebateWithApplyService;
     @Autowired
@@ -568,16 +570,12 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                             if (null != salesData) {
                                 salesDeptCode = salesData.getOrgCode();
                             }
-                            String busVinSid = vehInfo.getBusVinSid();
-                            String customerSid = busDeliveredApplyFeign.selCustomerByBusVinSid(busVinSid).getData();
-                            if (StringUtils.isNotBlank(customerSid)) {
-                                CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData();
-                                if (null != customerTemp) {
-                                    customerCode = customerTemp.getCustomerNo();
-                                }
-                            }
-
                         }
+                        String customerCwNo = baseVehicleOutFeign.selectCwCustomerNoByVinSid(rebate.getVehSid());
+                        if (StringUtils.isNotBlank(customerCwNo)) {
+                            customerCode = customerCwNo;
+                        }
+
                         if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
                             String useOrgSid = rebate.getUseOrgSid();
                             SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -32,11 +32,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -110,6 +110,8 @@ import static java.util.Comparator.comparing;
 @Service
 public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebateWithApplyMapper, ScmVehRebateWithApply> {
 
+    @Autowired
+    private BaseVehicleOutFeign baseVehicleOutFeign;
     @Autowired
     private ScmVehRebateWithService scmVehRebateWithService;
     @Autowired
@@ -603,17 +605,11 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                                 if (null != salesData) {
                                     salesDeptCode = salesData.getOrgCode();
                                 }
-                                String busVinSid = vehInfo.getBusVinSid();
-                                String customerSid = busDeliveredApplyFeign.selCustomerByBusVinSid(busVinSid).getData();
-                                if (StringUtils.isNotBlank(customerSid)) {
-                                    CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData();
-                                    if (null != customerTemp) {
-                                        customerCode = customerTemp.getCustomerNo();
-                                    }
-                                }
-
                             }
-
+                            String cwCustomer = baseVehicleOutFeign.selectCwCustomerNoByVinSid(rebate.getVehSid());
+                            if (StringUtils.isNotBlank(cwCustomer)) {
+                                customerCode = cwCustomer;
+                            }
                             GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                             voucherDetail.setTimeFlag(finalSummaryTag);
                             voucherDetail.setMaterial(vinCodeJR);