fix(jg):厂车车牌号校验唯一性

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

@@ -813,17 +813,28 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
         jgUseRegistration.setNextTaskId(workflowResultDto.getNextTaskId());
         jgUseRegistration.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-        if (isFirst) {
-            jgUseRegistration.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
-            jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
-        }
+
         if (!ObjectUtils.isEmpty(carNumber)) {
-            // 更新安全追溯-场内车辆中的“车牌号字段”
-            LambdaUpdateWrapper<IdxBizJgRegisterInfo> wrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
+            // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
+
+            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);
+            if (count > 0) {
+                throw new BadRequest("车牌号已存在，请重新输入！");
+            }
+
+            LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
                     .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
             IdxBizJgRegisterInfo idxBizJgRegisterInfo = new IdxBizJgRegisterInfo();
             idxBizJgRegisterInfo.setCarNumber(carNumber);
-            idxBizJgRegisterInfoMapper.update(idxBizJgRegisterInfo, wrapper);
+            idxBizJgRegisterInfoMapper.update(idxBizJgRegisterInfo, updateWrapper);
+        }
+
+        if (isFirst) {
+            jgUseRegistration.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
+            jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
         }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             jgUseRegistration.setNextExecuteIds(role);