修改 新增

gdg

2020-12-28 605a19169121bbcaaf559030dd1d9aae614f8026

 src/main/java/com/nanometer/smartlab/api/ApiAction.java

@@ -10,7 +10,8 @@
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;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
@@ -66,6 +67,8 @@
    private BaseMetaService baseMetaService;
    @Resource
    private InterfaceService interfaceService;
    @Resource
    private SysWarehouseService sysWarehouseService;

    @Resource
    private SysWarningService sysWarningService;
@@ -1187,7 +1190,10 @@
        return ResponseModel.getOkInstence(code);
    }


    /**
     * 获取替换字典
     *
     */
    @ResponseBody
    @RequestMapping("getEncodeReplaceDict")
    public Object getEncodeReplaceDict(@RequestParam String type) {
@@ -1205,6 +1211,10 @@

    }

    /**
     * 获取编码
     *
     */
    @ResponseBody
    @RequestMapping("getDangerousEncode")
    public Object getDangerousEncode(@RequestParam(required = false) String reagentName, @RequestParam(required = false) String cas) {
@@ -1218,6 +1228,65 @@
    }

    }
    /**
     * 获取仓库信息
     */
    @ResponseBody
    @RequestMapping("getWarehouseInfo")
    public Object getWarehouseInfo() {
        try {
            List<SysWarehouseDto> data = sysWarehouseService.getWarehouseList();
            return ResponseModel.getOkInstence(data);
        } catch (Exception e) {
            e.printStackTrace();
            logger.info(e);
            return ResponseModel.getErrInstance("系统出错");
        }

    }


    /**
    * @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("系统出错");
        }

    }


}