From d339f7f3a50fe4bf5f8e48e932472ebada852e86 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 14:14:47 +0800
Subject: [PATCH] 备货领取 订单取消保存
---
src/main/webapp/warehouse_reagent_use.xhtml | 2 +-
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 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..f24097d 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -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());
}
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index 5232d75..d631878 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -303,7 +303,7 @@
<p:commandButton value="关闭"
process="@this"
styleClass="yes-btn"
- actionListener="#{warehouseStockMngController.onCancelBtnClick}"
+ actionListener="#{warehouseStockMngController.closeDialog2}"
style="position: relative;left: 20px;"
update=":centerRootPanel"
oncomplete="PF('printDialog').hide()">
--
Gitblit v1.9.2