From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口

---
 src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
index 2d2fe60..dd7524f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
@@ -4,6 +4,7 @@
 import com.nanometer.smartlab.dao.SysWarehouseDao;
 import com.nanometer.smartlab.entity.*;
 import com.nanometer.smartlab.entity.dto.InWarehouseInfoDto;
+import com.nanometer.smartlab.entity.dto.ReagentReceivingDto;
 import com.nanometer.smartlab.entity.dto.SysWarehouseDto;
 import com.nanometer.smartlab.entity.enumtype.*;
 import com.nanometer.smartlab.exception.AlarmCode;
@@ -12,7 +13,6 @@
 import com.nanometer.smartlab.exception.ExceptionEnumCode;
 import com.nanometer.smartlab.util.IDUtils;
 import com.nanometer.smartlab.util.MessageUtil;
-import com.sun.xml.internal.bind.v2.model.core.ID;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.dao.DataAccessException;
@@ -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);
@@ -303,4 +320,21 @@
         }
 
     }
+
+    @Override
+    @Transactional
+    public void reagentReceiving(ReagentReceivingDto reagentReceiving) {
+
+        reagentReceiving.getReagentCode().forEach(code->{
+                //
+            OpeReagentStatus ors = opeReagentStatusService.getOpeReagentStatusByReagentCode(code);
+            //1.更新试剂状态  在仓库-》领用
+//            ors.setStatus(ArrivalStatus.PERSONAL);
+            ors.setContainerId(reagentReceiving.getLabContainerId());
+            ors.setHouseId(reagentReceiving.getLabId());
+            ors.setUserId(reagentReceiving.getApplyUserId());
+            opeReagentStatusService.updateReagentStatus(ors);
+        });
+
+    }
 }

--
Gitblit v1.9.2