From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
index ecbf8be..16c0ca7 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
@@ -226,12 +226,12 @@
}
@Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
- public void claimForPerson(List<OpeApplyReserve> selectedListForPerson,String userId,String projectNum,String laboratoryId,String laboratoryContainerId){
+ public void claimForPerson(List<OpeApplyReserve> selectedListForPerson,String userId,String projectNum,String laboratoryId,String laboratoryContainerId,String receiptNumber){
try{
for(OpeApplyReserve app:selectedListForPerson){
List<String> reagentCodes = app.getReagentCode();
if (reagentCodes != null && reagentCodes.size() > 0) {
- this.opeReagentStatusService.updateReagentStatus3(reagentCodes,userId,projectNum,laboratoryId,laboratoryContainerId);
+ this.opeReagentStatusService.updateReagentStatus3(reagentCodes,userId,projectNum,laboratoryId,laboratoryContainerId,receiptNumber);
//更新是现实库存
OpeLaboratoryReserve lr=new OpeLaboratoryReserve();
@@ -291,7 +291,7 @@
// 仓库领用
@Transactional(propagation = Propagation.REQUIRED)
- public void claim(List<OpeWarehouseReserve> selectedList, String userId,String projectNum) {
+ public void claim(List<OpeWarehouseReserve> selectedList, String userId,String projectNum,String receiptNumber) {
try {
for (OpeWarehouseReserve opeWarehouseReserve : selectedList) {
List<String> reagentCodes = opeWarehouseReserve.getReagentCodes();
@@ -302,7 +302,7 @@
opeReagentStatus.setUserId(userId);
opeReagentStatus.setProjectNum(projectNum);
//boolean flag = this.opeReagentStatusService.updateReagentStatus(opeReagentStatus);
- this.opeReagentStatusService.updateReagentStatus(opeReagentStatus);
+ this.opeReagentStatusService.updateReagentStatus(opeReagentStatus,receiptNumber);
//if (flag) {
//opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() - 1);
//opeWarehouseReserve.setSelectNum(0);
@@ -443,7 +443,7 @@
}
}
- public void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId){
+ public void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber){
if (reagentDStoreList == null) {
return;
}
@@ -518,6 +518,7 @@
metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
List<BaseMeta> baseMetaList2 = baseMetaDao.getBaseMetaList(metaMap2);
ouf.setOperateState(baseMetaList2.get(0).getId());
+ ouf.setReceiptNumber(receiptNumber);
this.opeUseFlowService.insertOpeUseFlow(ouf);
}
}
@@ -678,6 +679,11 @@
}
@Override
+ public OpeWarehouseReserve getRowData(String rowKey) {
+ return opeWarehouseReserveDao.getRowData(rowKey);
+ }
+
+ @Override
public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) {
if (opeList.size() < 1) {
return;
--
Gitblit v1.9.2