备货领取：补贴条码自动生成

lyfO_o

2021-10-22 d1e49b501683db8593dd2dda9eb5426feee1f6cb

 src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java

@@ -82,6 +82,8 @@

    @Resource
    SysLaboratoryContainerService sysLaboratoryContainer;
    @Resource
    SysLaboratoryService sysLaboratoryService;

    @Value("${message.url}")
    String url;
@@ -1009,7 +1011,7 @@
        }else{
          sysUser = sysUserDao.getSysUser(userID);
          // 如果是管理员也可以开柜
          if(sysUser.getSeeFlag() == SeeFlag.MANAGE){
          if(sysUser.getSeeFlag() == SeeFlag.MANAGE||sysUser.getSeeFlag() == SeeFlag.LEADING){
             return "1";
          } else {
             // 不可以打开柜子
@@ -1254,7 +1256,8 @@
                    logger.error("The containerCode has not been exists!");
                    continue;
                }
         } else if (status.equals(2)){
         }
         else if (status.equals(2)){
            /*SysWarehouseContainer container = sysWarehouseContainerDao
                  .getSysWarehouseContainerByContainerCode(containerCode);
            if (Objects.isNull(container) == false) {
@@ -1278,8 +1281,10 @@
         if (status.equals(-1)){
                continue;
            }
          opeReagentStatusDao.syncOpeReagentStatus(params);

          int i = opeReagentStatusDao.syncOpeReagentStatus(params);
            if (i < 1){
                opeReagentStatusDao.syncOpeReagentStatus(params);
            }
        }
    }

@@ -1486,7 +1491,20 @@
                }

            if(enable && "2".equals(warningId) ) {
                List<Map> personsInCharge = sysLaboratoryContainer.getContainerPersonInCharge(containerCode);
                //1.根据containerCode获取lab
                SysLaboratoryContainer container = sysLaboratoryContainer.getSysLaboratoryContainerByContainerCode(containerCode);
                SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratory(container.getLaboratoryId());
                String project = sysLaboratory.getProject();
                //2.根据Lab的课题组判断人员
                List<Map> personsInCharge = null;
                if (StringUtils.isBlank(project)) {
                    //没有课题组就是实验室部门下的负责人
                    personsInCharge = sysLaboratoryContainer.getContainerPersonInCharge(containerCode);
                } else {
                    //有课题组就是 所有课题组下的人员负责人
                    personsInCharge = sysLaboratoryService.getPersonInChargeByProjects(project);
                }

                Map param = new HashMap();
                param.put("groupId", "securityManager");
                List<BaseMeta> managers = baseMetaDao.getBaseMetaList(param);
@@ -1534,15 +1552,16 @@

            }
                sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
                // 将人员扣分更新到人员表
                if (warningPoint == null) {
                    warningPoint = 0;
                }
                 //   SysUser user = sysUserDao.getSysUser(userId);
                if (user != null) {
                    sysUserDao.updateUserPointBySelective(user.getPoint() - warningPoint, user.getId());
                }
         }
            // 将人员扣分更新到人员表
         if (warningPoint == null) {
            warningPoint = 0;
         }
//         SysUser user = sysUserDao.getSysUser(userId);
         if (user != null) {
            sysUserDao.updateUserPointBySelective(user.getPoint() - warningPoint, user.getId());
         }


      }
    }