bugfix:

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -852,10 +852,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (dataSource.contains("his") && EquipmentClassifityEnum.CC.getCode().equals(equipmentInfoForm.get(EQU_LIST)) && !ValidationUtil.isEmpty(equipmentInfoForm.get(CAR_NUMBER))) {
             String carNumber = String.valueOf(equipmentInfoForm.get(CAR_NUMBER));
             if (!"无".equals(carNumber)) {
-                Integer count = idxBizJgRegisterInfoService.lambdaQuery()
-                        .eq(IdxBizJgRegisterInfo::getCarNumber, carNumber)
-                        .ne(!StringUtils.isEmpty(record), IdxBizJgRegisterInfo::getRecord, record)
-                        .count();
+                Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniquenessWithHisCC(carNumber, record);
                 if (count > 0) {
                     throw new BadRequest("车牌号已存在，请重新输入！");
                 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -1843,10 +1843,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         .eq(JgUseRegistrationEq::getIsDelete, false);
                 JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
                 // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
-                LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(IdxBizJgRegisterInfo::getCarNumber, carNumber);
-                wrapper.ne(!ObjectUtils.isEmpty(jgUseRegistrationEq.getEquId()), IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
-                Integer count = idxBizJgRegisterInfoMapper.selectCount(wrapper);
+                Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniquenessWithHisCC(carNumber, jgUseRegistrationEq.getEquId());
                 if (count > 0) {
                     throw new BadRequest("车牌号已存在，请重新输入！");
                 }
@@ -3480,10 +3477,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (EquipmentClassifityEnum.CC.getCode().equals(map.get("EQU_LIST_CODE"))) {
                 String carNum = String.valueOf(map.get(carNumber));
                 if (!"无".equals(carNum)) {
-                    Integer count = idxBizJgRegisterInfoService.lambdaQuery()
-                            .eq(IdxBizJgRegisterInfo::getCarNumber, carNum)
-                            .ne(!StringUtils.isEmpty(equipId), IdxBizJgRegisterInfo::getRecord, equipId)
-                            .count();
+                    Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniquenessWithHisCC(carNumber, equipId);
                     if (count > 0) {
                         throw new BadRequest("车牌号已存在，请重新输入！");
                     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -60,4 +60,12 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     Integer selectByEquCodeAndClaimStatus(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr, @Param("record") String record);
 
     Integer selectInstallNoticeEqByEquCode(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr);
+
+    @Select("SELECT COUNT(*)\n" +
+            "    FROM idx_biz_jg_register_info jri\n" +
+            "    LEFT JOIN idx_biz_jg_other_info joi ON jri.RECORD = joi.RECORD\n" +
+            "    WHERE jri.car_number = #{carNumber}\n" +
+            "      AND jri.record <> #{record}\n" +
+            "      AND joi.CLAIM_STATUS = '已认领'")
+    Integer checkCarNumberUniquenessWithHisCC(@Param("carNumber") String carNumber, @Param("record") String record);
 }