From 4ad8653be79cb07fc7f450540ea20d82b3971b89 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 12 一月 2021 14:19:44 +0800
Subject: [PATCH] 模块：用户管理 修改：导入新增课题组,修改导入时插入的代码问题 提出：秦老师
---
src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
index b08c21f..dd7524f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
@@ -224,6 +224,21 @@
String reagentName = dangerousEncodes.get(0).getReagentName();
String cas = dangerousEncodes.get(0).getCas();
+ //危险性质 reagent_character
+ String dangerousInfo = dangerousEncodes.get(0).getMemo();
+ BaseMeta meta = baseMetaService.getBaseMeta("reagent_character", null, dangerousInfo);
+ BaseMeta baseMeta = new BaseMeta();
+ if (meta == null){
+ baseMeta.setId(IDUtils.uuid());
+ baseMeta.setGroupId("reagent_character");
+ baseMeta.setValidFlag(ValidFlag.VALID);
+ baseMeta.setMetaValue(dangerousInfo);
+ baseMeta.setMetaKey(dangerousInfo);
+ baseMetaService.insertBaseMeta(baseMeta);
+ }else{
+ baseMeta = meta;
+ }
+
//查找是否存在试剂
List<SysReagent> reagent = sysReagentService
.getReagent(reagentName, cas, factory.getId(), specifications.getId(), packing.getId());
@@ -243,6 +258,8 @@
sr.setProductHome(factory.getId());
sr.setReagentFormat(specifications.getId());
sr.setReagentUnit(packing.getId());
+ //危险性质
+ sr.setReagentCharacter(baseMeta.getId());
//设备生成试剂类型 为3
sr.setType(3);
sr.setDangerousFlag(DangerousFlag.NORMAL);
--
Gitblit v1.9.2