|
@ -617,27 +617,24 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi |
|
|
//根据销售订单车辆查询款项情况
|
|
|
//根据销售订单车辆查询款项情况
|
|
|
ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedService.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid()); |
|
|
ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedService.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid()); |
|
|
if (receiveInvoiceVoResultBean.getData() != null) { |
|
|
if (receiveInvoiceVoResultBean.getData() != null) { |
|
|
FinVehicleInvoice invoice = selectByVinAndContractNo(vinSid, contractNo).getData(); |
|
|
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { |
|
|
if (null != invoice) { |
|
|
String linkNo = busSalesOrderVehicle.getLinkNo(); |
|
|
if (StringUtils.isNotBlank(invoice.getVIN())) { |
|
|
String vinNo = ""; |
|
|
String linkNo = invoice.getVIN(); |
|
|
if (linkNo.length() > 8) { |
|
|
String vinNo = ""; |
|
|
String substringLinkNo = linkNo.substring(linkNo.length() - 8); |
|
|
if (linkNo.length() > 8) { |
|
|
vinNo = substringLinkNo; |
|
|
String substringLinkNo = linkNo.substring(linkNo.length() - 8); |
|
|
} else { |
|
|
vinNo = substringLinkNo; |
|
|
vinNo = linkNo; |
|
|
} else { |
|
|
} |
|
|
vinNo = linkNo; |
|
|
List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByVinNo(vinNo); |
|
|
} |
|
|
finSelectVoList.removeAll(Collections.singleton(null)); |
|
|
List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByVinNo(vinNo); |
|
|
if (!finSelectVoList.isEmpty()) { |
|
|
finSelectVoList.removeAll(Collections.singleton(null)); |
|
|
for (FinSelectInvoiceVo finSelectInvoiceVo : finSelectVoList) { |
|
|
if (!finSelectVoList.isEmpty()) { |
|
|
if (StringUtils.isBlank(finSelectInvoiceVo.getCollectionTypeValue())) { |
|
|
for (FinSelectInvoiceVo finSelectInvoiceVo : finSelectVoList) { |
|
|
finSelectInvoiceVo.setCollectionTypeValue("款项结转"); |
|
|
if (StringUtils.isBlank(finSelectInvoiceVo.getCollectionTypeValue())) { |
|
|
|
|
|
finSelectInvoiceVo.setCollectionTypeValue("款项结转"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
deliveredFinVo.setFinSelectVoList(finSelectVoList); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
deliveredFinVo.setFinSelectVoList(finSelectVoList); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo(); |
|
|
InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo(); |
|
|