From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
index a37acb1..67dd27b 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
@@ -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);
}
}
--
Gitblit v1.9.2