修改:把危化品编码得memo加入到试剂表中字段reagent_character危险性质
目的:库存得时候显示危险信息
提出:秦老师
已修改2个文件
19 ■■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml
@@ -58,7 +58,7 @@
    <select id="selectBaseMeta" resultMap="BaseMeta">
      select * from  base_meta
      where
      1= 1
      valid_flag = 1
      <if test="groupId != null and groupId != ''">
       and group_id = #{groupId}
      </if>
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);