From 3133c40cf7f5467db6c172b436f509c85e096eff Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 15:30:48 +0800
Subject: [PATCH] 修改仓库领用模块：补贴条码入库显示人员信息
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 4080ddb..ecde8c7 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1148,7 +1148,7 @@
this.opeWarehouseReserveService.reagentDStore3(opeList,userId);
//扣库存
- opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId);
+ opeWarehouseReserveService.btWarehouseReserveReduce(list2);
}
for(int i=0;i<list2.size();i++){
@@ -1251,6 +1251,20 @@
/**
* 点击打印 关联所有流向和领用单号e
*/
+
+
+ public void associatedFlowReceiptNumber2() {
+ try {
+ opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
+ //弹出打印窗口
+ RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
+ } catch (Exception e) {
+ logger.info(e.getMessage());
+ }
+
+ }
+
+
public void closeDialog() {
try {
opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
@@ -1261,11 +1275,10 @@
}
- public void associatedFlowReceiptNumber2() {
+ public void closeDialog2() {
try {
opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
- //弹出打印窗口
- RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
+ onCancelBtnClick();
} catch (Exception e) {
logger.info(e.getMessage());
}
@@ -1580,7 +1593,7 @@
opeUseFlow.setHouseId(list2.get(i).getWarehouseId());
opeUseFlow.setContainerId(warehouseReserveInfo.get(0).getContainerId());
opeUseFlow.setCreateTime(warehouseReserveInfo.get(0).getUpdateTime());
- opeUseFlow.setUserId(userId);
+ opeUseFlow.setUserId(warehouseReserveInfo.get(0).getUserId());
opeUseFlow.setRemainder(list2.get(i).getReagent().getMainMetering()!=null?list2.get(i).getReagent().getMainMetering():new BigDecimal(0));
opeUseFlow.setStoreType(StoreType.DIRECTSTORE);
--
Gitblit v1.9.2