From 1ab74b4cf9b57afab3b1ae2c3d31e04cf51c19b4 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 22 Nov 2023 16:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8E=82=E5=AE=B6=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=97=A5=E6=9C=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinBillApplicationService.java            | 27 ++++++++++---------
 .../ScmApplyInboundService.java               | 10 +++----
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 80d7c44cdb..9f2c2b0a5b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -704,20 +704,23 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
         if (finBillTrailerVos.size() > 0) {
             for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
-                FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
-                finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
-                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
-                List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
-                List<String> hgzImageUrls = new ArrayList<>();
-                for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
-                        hgzImageUrls.add(commonAppendixVo.getFileUrl());
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    if (finBillTrailerVo.getVinNo().equals(finBillVehicleVo.getVinNo())){
+                        finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
+                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
+                        List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
+                        List<String> hgzImageUrls = new ArrayList<>();
+                        for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+                            if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
+                                hgzImageUrls.add(commonAppendixVo.getFileUrl());
+                            }
+                        }
+                        finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
+                        if (finBillTrailerVo.getOneBillMoney() == null) {
+                            finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
+                        }
                     }
                 }
-                finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
-                if (finBillTrailerVo.getOneBillMoney() == null) {
-                    finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
-                }
             }
             vo.setFinBillTrailers(finBillTrailerVos);
         }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index e9694338b3..618a07117b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -217,13 +217,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             inboundVehicle.setOrgSidPath(orgPath);
             inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
 
-            if (StringUtils.isNotBlank(dto.getLogo())) {
+            /*if (StringUtils.isNotBlank(dto.getLogo())) {
                 if (dto.getLogo().equals("1")) {
                     inboundVehicle.setOrgPriceDate("");
                 }
             } else {
                 inboundVehicle.setOrgPriceDate(DateUtil.formatDate(new Date()));
-            }
+            }*/
             save(inboundVehicle);
             String num = dto.getNum();
             if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@@ -1026,7 +1026,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        int vinCount = 0;
+        /*int vinCount = 0;
         if (!vehicleList.isEmpty()) {
             for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
                 if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo()) && StringUtils.isNotBlank(scmApplyInboundVehicleDto.getEngineNo())) {
@@ -1037,7 +1037,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (vinCount < Integer.parseInt(num)) {
             dto.setOrgPriceDate("");
             dto.setLogo("1");
-        }
+        }*/
         if (StringUtils.isBlank(busSid)) {
             ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
             if (!resultBean.getSuccess()) {
@@ -1051,7 +1051,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 String vinNo = scmApplyInboundVehicleDto.getVinNo();
                 if (StringUtils.isBlank(vinNo)) {
                     scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
-                    BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto);
+                    BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto, "orgPriceDate");
                     scmApplyInboundDto.setSid(null);
                     scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
                 }