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