开票申请待办页查看款票情况

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

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