From b864f5d23d5e5a125d79984f8a5075fab6777015 Mon Sep 17 00:00:00 2001
From: yxt_mtl <2049520089@qq.com>
Date: Mon, 10 Mar 2025 14:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E3=80=81?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E3=80=81=E5=85=B3=E8=81=94=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml | 2 +-
 .../scm/biz/scmapplyinbound/ScmApplyInboundService.java  | 9 ++++-----
 .../main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java    | 2 +-
 3 files changed, 6 insertions(+), 7 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 65510e0f02..ca33b49c8b 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
@@ -1219,7 +1219,7 @@
     <select id="selVehicleByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT *
         FROM base_vehicle bv
-        WHERE vinNo = #{vinNo}
+        WHERE vinNo like concat('%', #{vinNo}, '%')
           AND isDelete = 0
           AND vehicleState != "0004"
     </select>
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 ac64a7fa7c..c6273fa0ee 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
@@ -11,10 +11,7 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -294,7 +291,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             // 验证数据库是否重复
             for (int i = 0; i < vinNoList.size(); i++) {
                 //int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getUseOrgSid(), dto.getSid());
-                BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
+               // BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
+                //检索集团内是否存在非删除、非退车的车架号
+                BaseVehicleVo data= baseVehicleFeign.selVehicleByVinNo(vinNoList.get(i)).getData();
                /* if (count > 0) {
                     baseMapper.updateNodeStatedtj(dto.getSid());
                     return new ResultBean().setMsg("入库车辆信息中" + vinNoList.get(i) + "车架号已经存在");
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
index 93d08d0e3b..c75704f7ab 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
@@ -24,7 +24,7 @@ public class OaForm extends BaseEntity {
     private String billNo;
     @ApiModelProperty("创建人")
     private String createByName;
-    @ApiModelProperty("公司sid")
+    @ApiModelProperty("sid")
     private String useOrgSid;
     @ApiModelProperty("公司名称")
     private String useOrgName;