From d7c52544bcfd3a25586de91c5636e34c070ac807 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 24 May 2023 11:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseOutsourcingApplicationService.java       |  3 +++
 .../FinBillApplicationService.java               | 16 ++++++++++++++++
 .../ScmVehicleExamineService.java                |  8 +-------
 .../advanceInvoice/AdvanceInvoicePageVo.java     |  3 ++-
 .../AppBusAdvanceGinvoiceapplyService.java       |  2 ++
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index dedd514c89..1b94aab1a5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -670,6 +670,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         scmEntryVehicleExamineDto.setVinNo("");
         scmEntryVehicleExamineDto.setPrice("");
         scmEntryVehicleExamineDto.setInspectionResult("1");
+        //外采申请分公司sid及分公司名称
+        scmEntryVehicleExamineDto.setUseOrgSid(booad.getUseOrgSid());
+        scmEntryVehicleExamineDto.setUseOrgName(booad.getUseOrgName());
         ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
         return resultBean1;
     }
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 9d31183e05..a0d03b2a1e 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
@@ -2220,6 +2220,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             } else {
                 record.setIsExistQKLP(false);
             }
+            String sid = record.getSid();
+            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
+            String vinNos = "";
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                String vinNo = finBillVehicleVo.getVinNo();
+                vinNos = vinNos + vinNo + ",";
+            }
+            record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
         }
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -2276,6 +2284,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             } else {
                 record.setIsExistQKLP(false);
             }
+            String sid = record.getSid();
+            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
+            String vinNos = "";
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                String vinNo = finBillVehicleVo.getVinNo();
+                vinNos = vinNos + vinNo + ",";
+            }
+            record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
         }
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
index d7fff972b9..49f496c7f1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@@ -469,13 +469,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         ResultBean rb = ResultBean.fireFail();
         ScmVehicleExamine scmVehicleExamine = new ScmVehicleExamine();
         BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid");
-        if (StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgSid()) && StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgName())) {
-            String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmEntryVehicleExamineDto.getUserSid()).getData();
-            SysOrganizationVo data = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
-            scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
-            scmVehicleExamine.setUseOrgSid(useOrgSid);
-            scmVehicleExamine.setUseOrgName(data.getName());
-        }
+        scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
         save(scmVehicleExamine);
         return rb.success().setData(scmVehicleExamine.getSid());
     }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
index 345ac6519d..95f0fae72b 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
@@ -39,5 +39,6 @@ public class AdvanceInvoicePageVo implements Vo {
     private String model;
     @ApiModelProperty("销售类型")
     private String type;
-
+    @ApiModelProperty("车架号（拼接）")
+    private String vinNo;
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
index 9956f549ce..a3398c49c5 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
@@ -129,6 +129,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             advanceInvoicePageVo.setModel(record.getModelName());
             advanceInvoicePageVo.setType(record.getSaleTypeValue());
             advanceInvoicePageVo.setContractType(record.getNodeState());
+            advanceInvoicePageVo.setVinNo(record.getVinNo());
             if (record.getNodeState().equals("待提交")) {
                 advanceInvoicePageVo.setShowUpdateBtn(true);
                 advanceInvoicePageVo.setShowDeleteBtn(true);
@@ -181,6 +182,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             advanceInvoicePageVo.setModel(record.getModelName());
             advanceInvoicePageVo.setType(record.getSaleTypeValue());
             advanceInvoicePageVo.setContractType(record.getNodeState());
+            advanceInvoicePageVo.setVinNo(record.getVinNo());
             if (record.getNodeState().equals("待提交")) {
                 advanceInvoicePageVo.setShowUpdateBtn(true);
                 advanceInvoicePageVo.setShowDeleteBtn(true);