From 758eb1f2cbd5be1f3403f3f3e74145396ec9830f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 24 六月 2021 12:16:37 +0800
Subject: [PATCH] 修改领用报错
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index f68b139..334cfea 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -8,9 +8,7 @@
import javax.annotation.Resource;
-import com.nanometer.smartlab.dao.BaseMetaDao;
-import com.nanometer.smartlab.dao.SysLaboratoryContainerDao;
-import com.nanometer.smartlab.dao.SysWarehouseContainerDao;
+import com.nanometer.smartlab.dao.*;
import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.dto.PersonUseDetail;
import com.nanometer.smartlab.entity.enumtype.OperateStatus;
@@ -25,7 +23,6 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import com.nanometer.smartlab.dao.OpeUseFlowDao;
import com.nanometer.smartlab.entity.enumtype.ArrivalStatus;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.exception.AlarmCode;
@@ -59,6 +56,8 @@
private SysReagentService sysReagentService;
@Resource
private BaseMetaDao baseMetaDao;
+ @Resource
+ private OpeReagentStatusDao opeReagentStatusDao;
@Transactional(propagation = Propagation.REQUIRED)
@@ -380,19 +379,17 @@
public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber) {
for (OpeApplyReserve oar : selectedTmpOrderList) {
- //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
- List<String> codeTmp = opeReagentStatusService
- .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
- assert codeTmp.size() > 0;
-
if (oar.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
- for (String statusId : codeTmp) {
+ for (String statusId : oar.getReagentCode()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
this.updateReceiptNumber(code, receiptNumber);
}
}else{
+ //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
+ List<String> codeTmp = opeReagentStatusService
+ .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
for (String code : codeTmp) {
this.updateReceiptNumber(code, receiptNumber);
}
@@ -434,19 +431,17 @@
@Override
public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber) {
for (OpeWarehouseReserve owr : selectTmpList) {
- //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
- List<String> codeTmp = opeReagentStatusService
- .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
- assert codeTmp.size() > 0;
-
if (owr.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
- for (String statusId : codeTmp) {
+ for (String statusId : owr.getReagentCodes()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
this.updateReceiptNumber(code, receiptNumber);
}
}else{
+ //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
+ List<String> codeTmp = opeReagentStatusService
+ .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
for (String code : codeTmp) {
this.updateReceiptNumber(code, receiptNumber);
}
@@ -544,4 +539,41 @@
return opeUseFlowDao.countOpeUseFlow(opeUseFlow);
}
+ @Override
+ @Transactional
+ public void scrapReagent(String reagentId,String reagentCode, String userId) {
+ //1.试剂状态表更新试剂状态为报废
+ OpeReagentStatus status = opeReagentStatusService.getStatus(reagentId, reagentCode);
+ if (status.getStatus() == ArrivalStatus.SCRAP) {
+ throw new BusinessException(ExceptionEnumCode.PARAM_ERR,"该试剂已是报废状态，无法进行操作");
+ }
+ //报废
+ status.setStatus(ArrivalStatus.SCRAP);
+ status.setUserId(userId);
+ opeReagentStatusDao.updateOpeReagentStatusDao(status);
+
+ //2.插入一条报废的流向记录
+ OpeUseFlow useFlow = new OpeUseFlow();
+ //获取报废状态id
+ Map<String, Object> params = new HashMap<>();
+ params.put("groupId", "operate_status");
+ params.put("metaKey", String.valueOf(OperateStatus.SCRAP.getKey()));
+ List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(params);
+ useFlow.setOperateState(baseMetas.get(0).getId());
+ useFlow.setReagentCode(reagentCode);
+ useFlow.setContainerId(status.getContainerId());
+ useFlow.setHouseId(status.getHouseId());
+ useFlow.setUserId(userId);
+ useFlow.setPlace(status.getPlace());
+ useFlow.setRemainder(status.getRemainder());
+ useFlow.setStoreType(status.getStoreType());
+ useFlow.setProject(status.getProjectNum());
+ useFlow.setArticleNumber(status.getArticleNumber());
+
+ useFlow.setCreateTime(new Timestamp(new Date().getTime()));
+ useFlow.setId(IDUtils.uuid());
+ opeUseFlowDao.insertOpeUseFlow(useFlow);
+
+ }
+
}
--
Gitblit v1.9.2