From 4bb9be1ace6a3d1c358615774616d45e4fc8253f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 3 Nov 2022 11:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basevehicle/BaseVehicleMapper.xml  |  2 ++
 .../biz/scmapplyinbound/ScmApplyInboundService.java   | 11 ++++++++---
 .../ScmVehicleEnterlibraryService.java                |  4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index bb607e5b4c..19592e99ae 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1054,6 +1054,7 @@
           AND modelSid = #{modelSid}
           AND modelConfigSid = #{configSid}
           AND createOrgSid = #{sellerOrgSid}
+          AND isDelete = 0
     </select>
 
     <select id="selVehicleByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
@@ -1146,6 +1147,7 @@
         FROM base_vehicle
         WHERE vinNo = #{vinNo}
           AND useOrgSid = #{useOrgSid}
+        AND isDelete = 0
     </select>
 
     <select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">
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 dc91e469b9..2d7781aaa0 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
@@ -256,10 +256,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i));
                 BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
                 if (count != 0) {
-                    return new ResultBean().setMsg("车架号已经存在");
+                    return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在");
                 }
                 if (data != null) {
-                    return new ResultBean().setMsg("车架号已经存在");
+                    return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在");
                 }
             }
             ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
@@ -457,7 +457,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
             dto.setVehicleList(scmApplyInboundVehicleDtos2);
             dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
-            saveOrUpdateApplyInBound(dto);
+            ResultBean<String> stringResultBean = saveOrUpdateApplyInBound(dto);
+            if (!stringResultBean.getSuccess()){
+                return new ResultBean().setMsg(stringResultBean.getMsg());
+            }
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
@@ -604,6 +607,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             baseVehicleDto.setManufacturerSid(baseVehicleBrand.getManufacturerSid());
             //厂商code
             baseVehicleDto.setManufacturerCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());
+            //供应商名称
+            baseVehicleDto.setSupplierName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
             //供应商sid
             baseVehicleDto.setSupplierSid(baseVehicleBrand.getManufacturerSid());
             //供应商code
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
index b7803d0550..43c8c211cd 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
@@ -448,6 +448,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         //供应商code
                         BaseManufacturerAllVo baseManufacturerAllVo1 = baseManufacturerFeign.details(applicationDetailsVo.getPurchasingUnitSid()).getData();
                         baseVehicleDto.setSupplierCode(baseManufacturerAllVo1.getBaseManufacturerDto().getManufacturerCode());
+                        //供应商名称
+                        baseVehicleDto.setSupplierName(baseManufacturerAllVo1.getBaseManufacturerDto().getManufacturerName());
                         if (resultBeanBaseManu.getData() != null) {
                             BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(resultBeanBaseManu.getData().getManufacturerSid()).getData();
                             baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid());
@@ -536,6 +538,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     //供应商code
                     SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(internalPurchaseDetailsVo.getSellerOrgSid()).getData();
                     baseVehicleDto.setSupplierCode(sysOrganizationVo2.getOtherCode());
+                    //供应商名称
+                    baseVehicleDto.setSupplierName(sysOrganizationVo2.getName());
                     //厂商sid 品牌 和 品牌 sid
                     BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(internalPurchaseDetailsVo.getBrandSid());
                     if (baseVehicleBrand != null) {