问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -12,16 +12,20 @@
     </select>
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
-        SELECT bv.*,
+        SELECT
+        bv.*,
         bvc.sid AS vehModelConfigSid,
         bvc.`guidedPrice`,
         bvcf.certificateStateValue
-        FROM base_vehicle bv
+        FROM
+        base_vehicle bv
         LEFT JOIN base_vehmodel_config bvc
         ON bv.`modelSid` = bvc.`modelSid`
-        AND bv.`modelConfigSid` = bvc.`configurationItemsSid` AND bvc.useOrgSid = bv.createOrgSid
+        AND bv.`modelConfigSid` = bvc.`configurationItemsSid`
+        AND bv.createOrgSid = bvc.useOrgSid
         LEFT JOIN base_vehicle_certificate bvcf
-        ON bv.`sid` = bvcf.`vehicleSid` AND bvcf.createOrgSid = bv.createOrgSid
+        ON bv.`sid` = bvcf.`vehicleSid`
+        AND bv.createOrgSid = bvcf.createOrgSid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+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.busvehicleorder.BusVehicleOrderFeign;
@@ -229,9 +230,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             // 验证数据库是否重复
             for (int i = 0; i < vinNoList.size(); i++) {
                 int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getSid());
+                BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
                 if (count != 0) {
                     return new ResultBean().setMsg("车架号已经存在");
                 }
+                if (data != null) {
+                    return new ResultBean().setMsg("车架号已经存在");
+                }
             }
             ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, scmApplyInbound);