1、新增质量文件并增加了版本号后，需要将质量文件与版本号的关联关系存到t_quality_file_assistent

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java

@@ -385,7 +385,7 @@ public class ApplyController extends BladeController {
                 goods.setNum(goods.getNum() + detail.getReturnNum());
                 goodsService.updateById(goods);
 
-                //批次数量回填
+                //批次数量回填（批次数量入库）
                 LambdaQueryWrapper<ProductStoreDetial> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(ProductStoreDetial::getGoodsId, detail.getProductId())
                         .eq(ProductStoreDetial::getPNum, detail.getBatchNum());

lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java

@@ -39,10 +39,15 @@ public class QualityFileAssistentController extends BladeController {
             QueryWrapper<QualityFileAssistent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("quality_file_id", file.getQualityFileId());
             List<QualityFileAssistent> list = qualityFileAssistentService.list(queryWrapper);
-            Integer version = list.stream().max(Comparator.comparing(QualityFileAssistent::getVersion)).get().getVersion();
-            file.setVersion(version + 1);
+            if(list.size() == 0){
+                file.setVersion(1);
+            }else{
+                Integer version = list.stream().max(Comparator.comparing(QualityFileAssistent::getVersion)).get().getVersion();
+                file.setVersion(version + 1);
+            }
             tmep = qualityFileAssistentService.save(file);
         }
+
        return R.data(tmep) ;
     }
 

lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java

@@ -27,6 +27,7 @@ import lombok.AllArgsConstructor;
 
 import javax.validation.Valid;
 
+import org.apache.commons.lang.math.RandomUtils;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -102,6 +103,19 @@ public class QualityFileController extends BladeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "传入qualityFile")
     public R save(@Valid @RequestBody QualityFileDTO qualityFile) {
+        boolean save = qualityFileService.save(qualityFile);
+        //将主表与版本关系存到t_quality_file_assistent
+        if(save){
+            long qulityFileAssistentId = RandomUtils.nextLong();
+            QualityFileAssistent qualityFileAssistent = new QualityFileAssistent();
+            qualityFileAssistent.setId(qulityFileAssistentId);
+            qualityFileAssistent.setVersion(Integer.valueOf(qualityFile.getVersion()));
+            qualityFileAssistent.setQualityFileId(qualityFile.getId());
+            qualityFileAssistent.setName("默认名称");
+            qualityFileAssistent.setStatus(1);
+            qualityFileAssistentService.save(qualityFileAssistent);
+        }
+
         return R.status(qualityFileService.save(qualityFile));
     }