From badb24bad173d03941aef128d3ec74188a4e4467 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 02 Feb 2021 14:37:47 +0800
Subject: [PATCH] 实验室导出
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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..008d127 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -166,6 +166,7 @@
private String warehouseName;
private Integer editFlag;
+ private Integer isAllApply = 0;
private StreamedContent file;
@Value("${pdf.export.file.path}")
private String pdfExportFilePath;
@@ -1148,7 +1149,7 @@
this.opeWarehouseReserveService.reagentDStore3(opeList,userId);
//扣库存
- opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId);
+ opeWarehouseReserveService.btWarehouseReserveReduce(list2);
}
for(int i=0;i<list2.size();i++){
@@ -1251,6 +1252,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 +1276,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 +1594,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);
@@ -1722,11 +1736,11 @@
}
try {
- int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id,reagentId, userName,productSn,applyCode,status);
+ int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply);
this.setRowCount(count);
if (count > 0) {
- list = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, first,
- pageSize,productSn,applyCode,status);
+ list = opeApplyService.getOpeApplyReserveListByNameFor(id, reagentId, userName, first,
+ pageSize, productSn, applyCode, status, isAllApply);
}
} catch (Exception e) {
logger.error(e);
@@ -1831,7 +1845,7 @@
realDataList=selectedListForPerson;
}else {
realDataList = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, null,
- null,productSn,applyCode,status);
+ null,productSn,applyCode,status,isAllApply);
}
List<String> headerList = new ArrayList<>();
headerList.add("申购编号");
@@ -3024,4 +3038,12 @@
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
+
+ public Integer getIsAllApply() {
+ return isAllApply;
+ }
+
+ public void setIsAllApply(Integer isAllApply) {
+ this.isAllApply = isAllApply;
+ }
}
--
Gitblit v1.9.2