From 836c2dcdbd62ecee439c859db1100c70078a9985 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Mon, 26 Sep 2022 10:12:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B9=B6=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=90=8E=EF=BC=8C=E9=9C=80=E8=A6=81=E5=B0=86?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=87=E4=BB=B6=E4=B8=8E=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E5=AD=98?= =?UTF-8?q?=E5=88=B0t=5Fquality=5Ffile=5Fassistent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/goods/controller/ApplyController.java | 2 +- .../controller/QualityFileAssistentController.java | 9 +++++++-- .../file/controller/QualityFileController.java | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index d0f3ae4..38be7b6 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/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 wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProductStoreDetial::getGoodsId, detail.getProductId()) .eq(ProductStoreDetial::getPNum, detail.getBatchNum()); diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java index 84b8495..accd861 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java @@ -39,10 +39,15 @@ public class QualityFileAssistentController extends BladeController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("quality_file_id", file.getQualityFileId()); List 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) ; } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java index 363b98f..4f0815e 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java +++ b/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)); }