试验材料进程材料编号判断

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialMaterialMobilizationServiceImpl.java

@@ -95,13 +95,20 @@ public class TrialMaterialMobilizationServiceImpl extends BaseServiceImpl<TrialM
         if (ObjectUtil.isEmpty(SecureUtil.getUserId())) {
             throw new ServiceException("获取用户信息失败");
         }
+        if(StringUtils.isNotEmpty(obj.getMaterialNumber())){
+            Long count = baseMapper.selectCount(Wrappers.<TrialMaterialMobilization>lambdaQuery().eq(TrialMaterialMobilization::getMaterialNumber, obj.getMaterialNumber())
+                    .ne( obj.getId() !=  null,TrialMaterialMobilization::getId, obj.getId()));
+            if (count > 0) {
+                throw new ServiceException("编号已存在");
+            }
+        }
         obj.setUserId(SecureUtil.getUserId());
         this.saveOrUpdate(obj);
         if(StringUtils.isNotEmpty(obj.getAutoIncrementNumber())){
-            if(obj.getTrialAutoNumber().equals(obj.getMaterialNumber())){
+            if(obj.getTrialNumber().equals(obj.getMaterialNumber())){
                 trialNumberRuleService.checkSave(obj.getContractId(), 1, obj.getId(), obj.getAutoIncrementNumber());
             }
-            bladeRedis.del("trialAutoNumber:" + obj.getContractId() + ":" + 1 + ":" + obj.getId() + ":" + "lock:" + obj.getAutoIncrementNumber());
+            //bladeRedis.del("trialAutoNumber:" + obj.getContractId() + ":" + 1 + ":" + obj.getId() + ":" + "lock:" + obj.getAutoIncrementNumber());
         }
 
         return true;