From 3133c40cf7f5467db6c172b436f509c85e096eff Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 15:30:48 +0800
Subject: [PATCH] 修改仓库领用模块：补贴条码入库显示人员信息
---
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
index 8f5995c..ed3c861 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
@@ -596,7 +596,7 @@
@Override
@Transactional
- public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo) {
+ public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId) {
OpeWarehouseReserve ope = this.opeWarehouseReserveService
.getOpeWarehouseReserve2(opeApplyReserve.getReagent().getId(), opeApplyReserve.getArticleNumber(),opeApplyReserve.getHouseId());
@@ -618,6 +618,8 @@
//批号
ope.setArticleNumber(opeApplyReserve.getArticleNumber());
ope.setId(IDUtils.uuid());
+ //新增收货人 保存在仓库库存表
+ ope.setUserId(consigneeId);
opeWarehouseReserveDao.insertOpeWarehouseReserve2(ope);
}else {
ope.setReserve(ope.getReserve() + opeApplyReserve.getArrivalNum());
@@ -677,7 +679,7 @@
}
@Override
- public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId) {
+ public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) {
if (opeList.size() < 1) {
return;
}
@@ -712,7 +714,7 @@
OpeUseFlow opeUseFlow = new OpeUseFlow();
opeUseFlow.setReagentCode(reagentCodes.get(0));
opeUseFlow.setStatus(ArrivalStatus.WAREHOUSE);
- opeUseFlow.setUserId(userId);
+ opeUseFlow.setUserId(warehouseReserve.getUserId());
//仓库地点
opeUseFlow.setHouseId(warehouseReserve.getWarehouseId());
opeUseFlow.setContainerId(warehouseReserve.getContainerId());
@@ -829,6 +831,7 @@
opeWarehouseReserve.setReserve(0);
opeWarehouseReserve.setWarehouseId(opeApply.getHouseId());
opeWarehouseReserve.setContainerId(opeApply.getContainerId());
+ opeWarehouseReserve.setUserId(loginUserId);
}
opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + opeApply.getArrivalNum());
if (StringUtils.isBlank(opeWarehouseReserve.getId())) {
--
Gitblit v1.9.2