试验编号bug

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialMaterialMobilizationDTO.java

@@ -27,7 +27,7 @@ public class TrialMaterialMobilizationDTO extends TrialMaterialMobilization {
     private Integer dataNumber;
 
     @ApiModelProperty("旧编号")
-    private String trialAutoNumber;
+    private String trialNumber;
 
     @ApiModelProperty("自增流水号")
     private String autoIncrementNumber;

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialSampleInfoDTO.java

@@ -22,7 +22,7 @@ public class TrialSampleInfoDTO extends TrialSampleInfo {
     private Integer dataNumber;
 
     @ApiModelProperty("旧编号")
-    private String trialAutoNumber;
+    private String trialNumber;
 
     @ApiModelProperty("自增流水号")
     private String autoIncrementNumber;

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

@@ -198,7 +198,7 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
         }
         this.saveOrUpdate(entrustInfo);
         String autoIncrementNumber=dataInfo.get("autoIncrementNumber")==null?"":dataInfo.get("autoIncrementNumber").toString();
-        String trialAutoNumber=dataInfo.get("trialAutoNumber")==null?"":dataInfo.get("trialAutoNumber").toString();
+        String trialAutoNumber=dataInfo.get("trialNumber")==null?"":dataInfo.get("trialNumber").toString();
         String entrustNo=entrustInfo.getEntrustNo()==null?"":entrustInfo.getEntrustNo();
         if(StringUtils.isNotEmpty(autoIncrementNumber)){
             if(trialAutoNumber.equals(entrustNo)){
@@ -216,7 +216,7 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
         }
         dataInfo.put("entrustInfoName",entrustInfo.getEntrustNo()+entrustInfo.getEntrustName());
         dataInfo.remove("autoIncrementNumber");
-        dataInfo.remove("trialAutoNumber");
+        dataInfo.remove("trialNumber");
         String pdfUrl = excelTabClient.saveEntrustTabData(dataInfo);
         return R.data(200,pdfUrl,"操作成功");
 	}

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

@@ -98,7 +98,7 @@ public class TrialMaterialMobilizationServiceImpl extends BaseServiceImpl<TrialM
         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());

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

@@ -149,7 +149,7 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
             }
             this.saveOrUpdate(trialSampleInfo);
             if(StringUtils.isNotEmpty(obj.getAutoIncrementNumber())){
-                if(obj.getTrialAutoNumber().equals(obj.getSpecificationNumber())){
+                if(obj.getTrialNumber().equals(obj.getSpecificationNumber())){
                     trialNumberRuleService.checkSave(obj.getContractId(), 2, obj.getId(), obj.getAutoIncrementNumber());
                 }
                 bladeRedis.del("trialAutoNumber:" + obj.getContractId() + ":" + 2 + ":" + obj.getId() + ":" + "lock:" + obj.getAutoIncrementNumber());