问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -533,4 +533,9 @@ public interface BaseVehicleFeign {
     @PostMapping("/setManDate")
     @ResponseBody
     ResultBean setManDate(@RequestBody ManDateQuery manDateQuery);
+
+    @ApiOperation("查询相同车架号在整个集团中是否存在非退库的")
+    @PostMapping("/selectVinNo")
+    @ResponseBody
+    ResultBean<Integer> selectVinNo(String vinNo);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -432,6 +432,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Integer> selectVinNo(String vinNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
         return null;

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

@@ -503,4 +503,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<BaseVehicleQKKPVo> vehicleQKKPPageList(IPage<BaseVehicleQKKPVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     void updateStateForReturnVeh(String vehSid);
+
+    int selectVinNo(String vinNo);
 }

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

@@ -1791,4 +1791,14 @@
             AND bs.vinNo != ''
         </where>
     </select>
+
+    <select id="selectVinNo" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                base_vehicle
+        WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
+          AND isDelete = 0
+          AND vehicleState != "0004"
+    </select>
 </mapper>

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

@@ -1507,6 +1507,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.setManDate(manDateQuery);
     }
 
+    @Override
+    public ResultBean<Integer> selectVinNo(String vinNo) {
+        return baseVehicleService.selectVinNo(vinNo);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

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

@@ -4406,4 +4406,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return rb.success();
     }
+
+    public ResultBean<Integer> selectVinNo(String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        int count = baseMapper.selectVinNo(vinNo);
+        return rb.success().setData(count);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -301,6 +301,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         List<String> zfQueryResults = dto.getZfQueryResults();
         List<LoanPreloanCreditPeoDto> loanPreloanCreditPeos = dto.getLoanPreloanCreditPeos();
         if (StringUtils.isBlank(dtoSid)) {//新增
+            if ("1".equals(dto.getCustTypeKey())){
+                dto.setQySid(dto.getCustSid());
+                dto.setQyName(dto.getCustName());
+            }
             String sid = this.insertByDto(dto).getData();
             for (String idCardImage : idCardImages) {
                 CommonAppendixDto commonAppendixDto = new CommonAppendixDto();

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

@@ -1041,6 +1041,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
                 }
             }
+            //判断相同车架号在整个集团中是否存在非退库的
+            Integer count = baseVehicleFeign.selectVinNo(scmApplyInboundVehicleDto.getVinNo().substring(scmApplyInboundVehicleDto.getVinNo().length() - 8)).getData();
+            if (count > 0){
+                return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "在集团中存在未退库的车辆，无法入库");
+            }
         }
         /*int vinCount = 0;
         if (!vehicleList.isEmpty()) {