From d098fd44b5ce242bae3a3cede322fdc95e85d3ea Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Mon, 26 Sep 2022 15:16:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B3=A8=E9=87=8A=E6=8E=89=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=89=A9=E5=93=81=E5=90=8E=E5=9C=A8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E8=AE=B0=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/controller/GoodsController.java     | 22 ++++++++++---------
 .../service/impl/QualityFileServiceImpl.java  |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
index b898b92..c2cd64b 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
@@ -10,6 +10,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.math.RandomUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -137,16 +138,17 @@ public class GoodsController extends BladeController {
         }
 //        goods.setDeactivate(1);
         // 物品详情入库
-        ProductStoreDetial productStoreDetial = new ProductStoreDetial();
-        productStoreDetial.setGoodsId(goods.getId());
-        productStoreDetial.setGoodsName(goods.getName());
-        productStoreDetial.setPNum(1);
-        productStoreDetial.setNum(goods.getNum());
-        productStoreDetial.setBeyondTime(new Date());
-        productStoreDetial.setCompany(goods.getCompany());
-        productStoreDetial.setLocation(goods.getLocation());
-        productStoreDetial.setStatus(0);
-        productStoreDetialService.save(productStoreDetial);
+        goods.setId(RandomUtils.nextLong());
+//        ProductStoreDetial productStoreDetial = new ProductStoreDetial();
+//        productStoreDetial.setGoodsId(goods.getId());
+//        productStoreDetial.setGoodsName(goods.getName());
+//        productStoreDetial.setPNum(1);
+//        productStoreDetial.setNum(goods.getNum());
+//        productStoreDetial.setBeyondTime(new Date());
+//        productStoreDetial.setCompany(goods.getCompany());
+//        productStoreDetial.setLocation(goods.getLocation());
+//        productStoreDetial.setStatus(0);
+//        productStoreDetialService.save(productStoreDetial);
         if (goods.getBigClassId() != null) {
             ProductClass productClass = productClassService.getById(goods.getBigClassId());
             goods.setBigClass(productClass.getName());
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
index 5dc4311..4a5cacd 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
@@ -109,7 +109,7 @@ public class QualityFileServiceImpl extends BaseServiceImpl<QualityFileMapper, Q
         qualityFile.setId(fileId);
 
         QualityFileAssistent assistent = new QualityFileAssistent();
-        assistent.setVersion(1);
+        assistent.setVersion(StringUtil.isBlank(qualityFile.getVersion()) == true ? 1 : Integer.parseInt(qualityFile.getVersion()));
         assistent.setStatus(1);
         assistent.setName("默认名称");
         assistent.setQualityFileId(qualityFile.getId());