diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index b6975cf16d..cb1439d3b3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1689,6 +1689,7 @@ public class BaseVehicleOutService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1600,6 +1566,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3); @@ -1635,8 +1603,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(finBillApplication.getSid()); - List finBillTrailerVos = finBillTrailerService.fetchByMainSid(finBillApplication.getSid()); - for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { - if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillVehicleVo.getVinNo().substring(finBillVehicleVo.getVinNo().length() - 8))) { - int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); - if (count == 0) { - FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); - finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); - finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); - finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); - finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); - finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); - finVehicleInvoiceDto.setBillingStateKey("001"); - finVehicleInvoiceDto.setBillingState("未开票"); - finVehicleInvoiceDto.setTransferStateKey("001"); - finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("主车"); - finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); - finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); - BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); - if (busArrearsCarryVehicleApplyVo == null) { - finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); - } else { - finVehicleInvoiceDto.setBusinessStateKey("005"); - finVehicleInvoiceDto.setBusinessState("欠款提车"); - } - finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { - finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); - finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); - finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); - finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); - finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); - } else { - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } - finVehicleInvoiceDto.setIsTakeTicket("是"); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); - } - } - } - if (finBillTrailerVos != null) { - for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { - if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillTrailerVo.getVinNo().substring(finBillTrailerVo.getVinNo().length() - 8))) { - String gcVinNo = finBillTrailerVo.getGcVinNo(); - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); - int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); - if (count == 0) { - FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); - finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); - finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); - finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); - finVehicleInvoiceDto.setVIN(gcVinNo); - finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); - finVehicleInvoiceDto.setBillingStateKey("001"); - finVehicleInvoiceDto.setBillingState("未开票"); - finVehicleInvoiceDto.setTransferStateKey("001"); - finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("挂车"); - finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); - finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); - finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); - finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { - finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); - finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); - finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); - finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); - finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); - } else { - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } - finVehicleInvoiceDto.setIsTakeTicket("是"); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); - } - } - } - } - } else {//出库开票申请 - BusBillApplication busBillApplication = busBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData(); - List busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData(); - List busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData(); - for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { - if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillVehicleVo.getVinNo().substring(busBillVehicleVo.getVinNo().length() - 8))) { - int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid()); - if (count == 0) { - FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); - finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); - finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); - finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid()); - finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo()); - finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney()); - finVehicleInvoiceDto.setBillingStateKey("001"); - finVehicleInvoiceDto.setBillingState("未开票"); - finVehicleInvoiceDto.setTransferStateKey("001"); - finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("主车"); - finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); - finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); - BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); - if (busArrearsCarryVehicleApplyVo == null) { - finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); - } else { - finVehicleInvoiceDto.setBusinessStateKey("005"); - finVehicleInvoiceDto.setBusinessState("欠款提车"); - } - finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { - finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); - finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); - finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); - finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); - finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); - } else { - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData(); - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } - finVehicleInvoiceDto.setIsTakeTicket("是"); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); - } - } - } - if (busBillTrailerVos != null) { - for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) { - if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillTrailerVo.getVinNo().substring(busBillTrailerVo.getVinNo().length() - 8))) { - String gcVinNo = busBillTrailerVo.getGcVinNo(); - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); - int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); - if (count == 0) { - FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); - finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); - finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); - finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); - finVehicleInvoiceDto.setVIN(gcVinNo); - finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney())); - finVehicleInvoiceDto.setBillingStateKey("001"); - finVehicleInvoiceDto.setBillingState("未开票"); - finVehicleInvoiceDto.setTransferStateKey("001"); - finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("挂车"); - finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName()); - finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); - finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); - finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { - finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); - finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); - finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); - finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); - finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); - } else { - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData(); - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } - finVehicleInvoiceDto.setIsTakeTicket("是"); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); - } - } - } - } - } - } - } return rb.success().setMsg("款项确认成功"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index deae6dddfb..a12664ba55 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -1263,6 +1263,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid()); + FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = new FinSelectedReceivablesDetailedVo(); + finSelectedReceivablesDetailedVo.setReceivablesName(appFinFundsCarriedForwardYXYSKXVo.getProjectName()); + finSelectedReceivablesDetailedVo.setCurrentReceivableMoney(appFinFundsCarriedForwardYXYSKXVo.getReceivable()); + finSelectedReceivablesDetailedVo.setSubscriptionMoney(appFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()); + finSelectedReceivablesDetailedVo.setContractNo(appFinFundsCarriedForwardYXYSKXVo.getContractId()); + finSelectedReceivablesDetailedVo.setVIN(appFinFundsCarriedForwardYXYSKXVo.getVin()); + finSelectedReceivablesDetailedService.tskpgl(finSelectedReceivablesDetailedVo); } jzComplete(businessSid); tsqtysd(businessSid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 8c16f6fdf2..7e429de796 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -30,14 +30,38 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign; +import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerFeign; +import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo; +import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleFeign; +import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; +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.finbilltrailer.FinBillTrailerVo; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; +import com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService; +import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService; +import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService; +import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService; +import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; @@ -79,6 +103,30 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService listPage(PagerQuery pq) { FinSelectedReceivablesDetailedQuery query = pq.getParams(); @@ -609,4 +657,211 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(finBillApplication.getSid()); + List finBillTrailerVos = finBillTrailerService.fetchByMainSid(finBillApplication.getSid()); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillVehicleVo.getVinNo().substring(finBillVehicleVo.getVinNo().length() - 8))) { + int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("主车"); + finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null) { + finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); + } else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } + finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + } + } + } + if (finBillTrailerVos != null) { + for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { + if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillTrailerVo.getVinNo().substring(finBillTrailerVo.getVinNo().length() - 8))) { + String gcVinNo = finBillTrailerVo.getGcVinNo(); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); + int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); + finVehicleInvoiceDto.setVIN(gcVinNo); + finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); + finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); + finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + } + } + } + } + } else {//出库开票申请 + BusBillApplication busBillApplication = busBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData(); + List busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData(); + List busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData(); + for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { + if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillVehicleVo.getVinNo().substring(busBillVehicleVo.getVinNo().length() - 8))) { + int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid()); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney()); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("主车"); + finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null) { + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + } else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } + finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + } + } + } + if (busBillTrailerVos != null) { + for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) { + if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillTrailerVo.getVinNo().substring(busBillTrailerVo.getVinNo().length() - 8))) { + String gcVinNo = busBillTrailerVo.getGcVinNo(); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); + int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); + finVehicleInvoiceDto.setVIN(gcVinNo); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceService.mySave(finVehicleInvoiceDto); + } + } + } + } + } + } + } + } } \ No newline at end of file