From 8e2b983273b816b33e7456f6c30a2577d443fb43 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 22 四月 2021 10:26:44 +0800
Subject: [PATCH] 根据课题组展示库存情况
---
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java | 116 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
index 33cd818..8b14efa 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +63,8 @@
private OpeUseFlowDao opeUseFlowDao;
@Resource
private OpeWarehouseReserveDao opeWarehouseReserveDao;
+ @Resource
+ private BaseRoleService baseRoleService;
@Resource(name="baseMetaDao")
BaseMetaDao baseMetaDao;
@@ -106,7 +109,18 @@
params.put("name", "%" + name + "%");
params.put("articleNumber", articleNumber);
params.put("status", status);
- addParamByUserId(userId, params);
+// addParamByUserId(userId, params);
+ if (StringUtils.isNotBlank(userId)) {
+ SysUser sysUser = sysUserService.getSysUser(userId);
+ BaseRole baseRole = baseRoleService.getBaseRole(sysUser.getRoleId());
+ //不是系统管理员 根据用户的课题组判断可视（用户所在课题组是否 在实验室的课题组下）
+ if (!"系统管理员".equals(baseRole.getName())) {
+ if (StringUtils.isBlank(sysUser.getProject())) {
+ return null;
+ }
+ params.put("project", sysUser.getProject());
+ }
+ }
if (StringUtils.isNotBlank(reagentCode)) {
params.put("reagentCode", "%" + reagentCode + "%");
}
@@ -127,8 +141,19 @@
Map<String, Object> params = new HashMap<String, Object>();
params.put("name", "%" + name + "%");
- addParamByUserId(userId, params);
+// addParamByUserId(userId, params);
params.put("articleNumber", articleNumber);
+ if (StringUtils.isNotBlank(userId)) {
+ SysUser sysUser = sysUserService.getSysUser(userId);
+ BaseRole baseRole = baseRoleService.getBaseRole(sysUser.getRoleId());
+ //不是系统管理员 根据用户的课题组判断可视（用户所在课题组是否 在实验室的课题组下）
+ if (!"系统管理员".equals(baseRole.getName())) {
+ if (StringUtils.isBlank(sysUser.getProject())) {
+ return 0;
+ }
+ params.put("project", sysUser.getProject());
+ }
+ }
if (StringUtils.isNotBlank(reagentCode)) {
params.put("reagentCode", "%" + reagentCode + "%");
}
@@ -476,45 +501,48 @@
}
@Override
- @Transactional(propagation = Propagation.REQUIRED)
- public boolean updateReagentStatus3(OpeReagentStatus opeReagentStatus) {
+ public boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId) {
try {
- //1.判断->试剂状态是否为在仓库
- if (isAllowWarehouseUse(opeReagentStatus)) {
- //1.1获得 试剂的库存选择批次
- List<OpeWarehouseReserve> owrList = this.opeWarehouseReserveService
- .getOpeWarehouseReserveList(opeReagentStatus.getReagent().getId(), opeReagentStatus.getArticleNumber(),opeReagentStatus.getHouseId());
- //在同一个仓库有相同批次的试剂,根据时间早的，个数少的先扣除库存
- owrList.get(0).setReserve(owrList.get(0).getReserve() - 1);
- this.opeWarehouseReserveService.updateOpeWarehouseReserve(owrList.get(0));
+ for (String opeReagentStatusId : reagentCodes) {
+ OpeReagentStatus opeReagentStatus = this.getOpeReagentStatus(opeReagentStatusId);
+ opeReagentStatus.setUserId(userId);
+ opeReagentStatus.setProjectNum(projectNum);
+ //1.判断->试剂状态是否为在仓库
+ if (isAllowWarehouseUse(opeReagentStatus)) {
+ //1.1获得 试剂的库存选择批次
+ List<OpeWarehouseReserve> owrList = this.opeWarehouseReserveService
+ .getOpeWarehouseReserveList(opeReagentStatus.getReagent().getId(), opeReagentStatus.getArticleNumber(), opeReagentStatus.getHouseId());
+ //在同一个仓库有相同批次的试剂,根据时间早的，个数少的先扣除库存
+ owrList.get(0).setReserve(owrList.get(0).getReserve() - 1);
+ this.opeWarehouseReserveService.updateOpeWarehouseReserve(owrList.get(0));
+ }
+ //设置 试剂状态->领用待入库
+ opeReagentStatus.setStatus(ArrivalStatus.NOREGISTER);
+ opeReagentStatus.setHouseId(laboratoryId);
+ opeReagentStatus.setContainerId(laboratoryContainerId);
+ int row = this.updateOpeReagentStatus(opeReagentStatus);
+
+ if (row == 0) {
+ return false;
+ }
+
+ OpeUseFlow opeUseFlow = new OpeUseFlow();
+ opeUseFlow.setReagentCode(opeReagentStatus.getReagentCode());
+ opeUseFlow.setStatus(opeReagentStatus.getStatus());
+ opeUseFlow.setHouseId(laboratoryId);
+ opeUseFlow.setContainerId(laboratoryContainerId);
+ opeUseFlow.setUserId(opeReagentStatus.getUserId());
+ opeUseFlow.setPlace(opeReagentStatus.getPlace());
+ opeUseFlow.setRemainder(opeReagentStatus.getRemainder());
+
+ Map<String, String> metaMap = new HashMap<>();
+ metaMap.put("groupId", "operate_status");
+ metaMap.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+ List<BaseMeta> baseMetaList = baseMetaDao.getBaseMetaList(metaMap);
+ opeUseFlow.setOperateState(baseMetaList.get(0).getId());
+
+ this.opeUseFlowService.insertOpeUseFlow(opeUseFlow);
}
- //设置 试剂状态->领用待入库
- opeReagentStatus.setStatus(ArrivalStatus.NOREGISTER);
- int row = this.opeReagentStatusDao.updateOpeReagentStatusDao(opeReagentStatus);
-
- if (row == 0) {
- return false;
- }
-
-
-
- OpeUseFlow opeUseFlow = new OpeUseFlow();
- opeUseFlow.setReagentCode(opeReagentStatus.getReagentCode());
- opeUseFlow.setStatus(opeReagentStatus.getStatus());
- opeUseFlow.setHouseId(opeReagentStatus.getHouseId());
- opeUseFlow.setContainerId(opeReagentStatus.getContainerId());
- opeUseFlow.setUserId(opeReagentStatus.getUserId());
- opeUseFlow.setPlace(opeReagentStatus.getPlace());
- opeUseFlow.setRemainder(opeReagentStatus.getRemainder());
-
- Map<String, String> metaMap = new HashMap<>();
- metaMap.put("groupId", "operate_status");
- metaMap.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
- List<BaseMeta> baseMetaList = baseMetaDao.getBaseMetaList(metaMap);
- opeUseFlow.setOperateState(baseMetaList.get(0).getId());
-
- this.opeUseFlowService.insertOpeUseFlow(opeUseFlow);
-
return true;
} catch (DuplicateKeyException ex) {
logger.warn(ex.getMessage(), ex);
@@ -527,6 +555,9 @@
logger.error(ex.getMessage(), ex);
throw new BusinessException(ExceptionEnumCode.DB_ERR,
MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), ex);
+ }catch(Exception e){
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
}
@@ -576,7 +607,6 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
public OpeReagentStatus getOpeReagentStatus(String id) {
try {
return this.opeReagentStatusDao.getOpeReagentStatus(id);
@@ -587,7 +617,6 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
public OpeReagentStatus getOpeReagentStatusByReagentCode2(OpeReagentStatus opeReagentStatus) {
try {
OpeReagentStatus status = this.opeReagentStatusDao.getOpeReagentStatusByReagentCode(opeReagentStatus.getReagentCode());
@@ -600,7 +629,6 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
public OpeReagentStatus getOpeReagentStatusByReagentCode(String reagentCode) {
try {
OpeReagentStatus status = this.opeReagentStatusDao.getOpeReagentStatusByReagentCode(reagentCode);
@@ -1042,8 +1070,8 @@
}
@Override
- public void updateOpeReagentStatus(OpeReagentStatus opeReagentStatus) {
- opeReagentStatusDao.updateOpeReagentStatusDao(opeReagentStatus);
+ public int updateOpeReagentStatus(OpeReagentStatus opeReagentStatus) {
+ return opeReagentStatusDao.updateOpeReagentStatusDao(opeReagentStatus);
}
@Override
--
Gitblit v1.9.2