试验修改

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TrialBaseInfo.java

@@ -109,6 +109,12 @@ public class TrialBaseInfo implements  DataModel{
     @JSONField(name = "key_15",label="样品数量",ordinal = 15)
     private String materialCount;
 
+    /**
+     * 样品数量
+     */
+    @JSONField(name = "key_16",label="强度等级",ordinal = 16)
+    private String designStrength;
+
     public Object getValueByKey(String key) {
         String keyPrefix = TBN + ":";
         if ((keyPrefix + "key_1").equals( key)) {
@@ -141,6 +147,8 @@ public class TrialBaseInfo implements  DataModel{
             return samplingDate;
         } else if ((keyPrefix + "key_15").equals(key)) {
             return materialCount;
+        } else if ((keyPrefix + "key_16").equals(key)) {
+            return designStrength;
         }
         return null;
     }

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

@@ -2179,6 +2179,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
                 baseMapper.delSelfSample(record.getId());
                 info = null;
                 baseInfo.setTrialSampleInfo(null);
+                entrustInfoService.update(Wrappers.<EntrustInfo>lambdaUpdate().eq(EntrustInfo::getId, record.getId()).set(EntrustInfo::getExpCount, 0));
             }
         }
         if (entrustInfo != null && info == null && oldTrialSampleInfo != null) {
@@ -2194,12 +2195,12 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
         if (oldRecord == null) {
             if(StringUtils.isNotEmpty(record.getRecordNo())){
                 if(StringUtils.isNotEmpty(record.getRecordNo())){
-                    a= trialNumberRuleService.checkTrialNumberIsExist(record.getRecordNo(), 4);
+                    a= trialNumberRuleService.checkTrialNumberIsExist(record.getRecordNo(), 4, record.getContractId());
                 }
             }
             if(StringUtils.isNotEmpty(record.getRecordNo())){
                 if(StringUtils.isNotEmpty(record.getReportNo())){
-                    b= trialNumberRuleService.checkTrialNumberIsExist(record.getReportNo(), 5);
+                    b= trialNumberRuleService.checkTrialNumberIsExist(record.getReportNo(), 5, record.getContractId());
                 }
             }
             if(!a){
@@ -2291,13 +2292,11 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             if(dto.getOldRecordNumber()!=null&&dto.getOldRecordNumber().equals(dto.getRecordNo())){
                 if(StringUtils.isNotEmpty(dto.getRecordAutoNumber())){
                     trialNumberRuleService.checkSave(dto.getContractId(),4,record.getId(),dto.getRecordAutoNumber());
-                    bladeRedis.del("trialAutoNumber:" + dto.getContractId() + ":" + 4 + ":" + record.getNodeId() + ":" + "lock:" + dto.getRecordAutoNumber());
                 }
             }
             if(dto.getOldReportNumber()!=null&&dto.getOldReportNumber().equals(dto.getReportNo())){
                 if(StringUtils.isNotEmpty(dto.getReportAutoNumber())){
                     trialNumberRuleService.checkSave(dto.getContractId(),5,record.getId(),dto.getReportAutoNumber());
-                    bladeRedis.del("trialAutoNumber:" + dto.getContractId() + ":" + 5 + ":" + record.getNodeId() + ":" + "lock:" + dto.getReportAutoNumber());
                 }
             }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -4909,7 +4909,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
      * 试验 委托单获取填报信息  groupId和sampleId1必须传其中一个
      */
     @Override
-    public List<Map<String, Object>> getBussDataInfoTrialentrust(Long groupId, Long pkeyId, Long contractId,Long sampleId1,JSONObject jsonObject,Boolean isremove) {
+    public List<Map<String, Object>> getBussDataInfoTrialentrust(Long groupId, Long pkeyId, Long contractId,Long sampleId1,JSONObject jsonObject,Boolean isremove,Boolean isCaneal) {
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
         String sys_file_net_url = ParamCache.getValue(CommonConstant.SYS_FILE_NET_URL);
         List<Map<String, Object>> list = new ArrayList<>();