From 61de83f769642ff7da3d7f32b39c5014167a2950 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期五, 15 一月 2021 17:34:48 +0800 Subject: [PATCH] 修改试剂库、库存查询,登录超时,导出订单领取 --- src/main/java/com/nanometer/smartlab/api/ApiAction.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java index 91c0c46..9f38637 100644 --- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java +++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java @@ -1400,6 +1400,7 @@ lr.setValidFlag(ValidFlag.VALID); opeLaboratoryReserveService.insert(lr); + opeReagentStatus.setStatus(ArrivalStatus.NOREGISTER); opeReagentStatus.setUserId(reagentReceiving.getApplyUserId()); opeReagentStatus.setHouseId(reagentReceiving.getLabId()); opeReagentStatus.setContainerId(reagentReceiving.getLabContainerId()); @@ -1439,7 +1440,7 @@ return ResponseModel.getErrInstance("账户名为空"); } - HazardousWasteUser sysUser = sysUserService.getUserByAccount(account); + HazardousWasteUser sysUser = sysUserService.getUserByAccount(account,null); if (sysUser == null){ return ResponseModel.getErrInstance("账户名不存在"); }else{ @@ -1540,8 +1541,8 @@ hazardousWaste.setTid(sdf.format(new Date())); hazardousWaste.setCreateTime(new Date()); hazardousWaste.setStatus("待确认"); - HazardousWasteUser sysUser = sysUserService.getUserByAccount(hazardousWaste.getApplyPerson()); - hazardousWaste.setUnit( sysUser.getCompany()); + HazardousWasteUser sysUser = sysUserService.getUserByAccount(null,hazardousWaste.getApplyPerson()); + hazardousWaste.setUnit(sysUser.getCompany()); if (hazardousWaste.getAcid()== null){ hazardousWaste.setAcid(new BigDecimal(0)); } -- Gitblit v1.9.2