From 605a19169121bbcaaf559030dd1d9aae614f8026 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 28 十二月 2020 09:51:28 +0800 Subject: [PATCH] 修改 新增 --- src/main/java/com/nanometer/smartlab/api/ApiAction.java | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java index dbf3054..53318c8 100644 --- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java +++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java @@ -10,7 +10,7 @@ import com.nanometer.smartlab.dao.SysLaboratoryContainerDao; import com.nanometer.smartlab.dao.SysWarehouseContainerDao; import com.nanometer.smartlab.entity.*; -import com.nanometer.smartlab.entity.SysWarning; +import com.nanometer.smartlab.entity.dto.InWarehouseInfoDto; import com.nanometer.smartlab.entity.dto.SysWarehouseDto; import com.nanometer.smartlab.entity.enumtype.ApiStatus; import com.nanometer.smartlab.entity.enumtype.ReplaceDictType; @@ -1246,6 +1246,47 @@ } + /** + * @Description: 获取所有人员,人员相关实验室,实验室相关试剂柜 + * @date 2020/12/23 16:47 + */ + @ResponseBody + @RequestMapping("getApplyPersonDetailInfo") + public Object getApplyPersonDetailInfo() { + try { + List data = sysUserService.getUserInfo(); + return ResponseModel.getOkInstence(data); + } catch (Exception e) { + e.printStackTrace(); + logger.info(e); + return ResponseModel.getErrInstance("系统出错"); + } + + } + + + /** + * @Description: 入库 + * @date 2020/12/24 14:19 + */ + @ResponseBody + @RequestMapping("putInStorage") + public Object putInWarehouse(@RequestBody InWarehouseInfoDto inWarehouseInfo) { + try { + + if (inWarehouseInfo.getReagentCode() != null && inWarehouseInfo.getReagentCode().size() > 0) { + sysWarehouseService.putInWarehouse(inWarehouseInfo); + return ResponseModel.getOkInstence("入库成功"); + } else { + return ResponseModel.getErrInstance("无试剂条码"); + } + } catch (Exception e) { + e.printStackTrace(); + logger.info(e); + return ResponseModel.getErrInstance("系统出错"); + } + + } } -- Gitblit v1.9.2