From 2571a50fdce54e4cb2046f7166481287435e94ae Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 11 Aug 2023 10:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E9=A1=B5=E6=9F=A5=E7=9C=8B=E6=AC=BE=E7=A5=A8=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinVehicleInvoiceService.java             | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
index 150f874a27..623b8ef846 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
+++ b/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();