From acd2fbfdd949d314ba6f0b85e28b67689d0a62ef Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 11:38:30 +0800
Subject: [PATCH] 修改传感器信息的图

---
 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index ecde8c7..527e594 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -47,8 +47,8 @@
 /**
  * Created by cmower on 17/11/20.
  */
-@Controller
 @PropertySource(value = "WEB-INF/config.properties",encoding = "utf-8")
+@Controller
 @Scope("session")
 public class WarehouseStockMngController extends BaseController {
 
@@ -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;
@@ -530,6 +531,13 @@
 		selectedTmpOrderList = null;
 	}
 
+	public void hideOrderTmp() {
+		//清空
+		selectedTmpOrderList = null;
+		//隐藏
+		RequestContext.getCurrentInstance().execute("document.getElementById('showTabOrder').style.display='none'");
+	}
+
 	public void  clearInputStorageTmp(){
 		selectedInputStorageTmpOrderList = null;
 	}
@@ -562,6 +570,10 @@
 
 	}
 
+	public void hide(){
+		selectedTmpList = null;
+		RequestContext.getCurrentInstance().execute("document.getElementById('showTab').style.display='none'");
+	}
 	public void cancelOrderTmp(){
 		if (trulySelectedOrderList == null || trulySelectedOrderList.size()<=0){
 			FacesUtils.info("至少选择一个");
@@ -623,7 +635,7 @@
 			FacesUtils.info("至少选择一个");
 			return;
 		}
-
+		this.userId = getUser().getId();
 		this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW, Constants.PAGE_WAREHOUSE_STOCK_MNG);
 	}
 //
@@ -648,6 +660,8 @@
 			}
 		}
 		checkTable = null;
+		//
+		this.userId = selectedTmpOrderList.get(0).getApplyUser();
 
 		this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
 	}
@@ -1735,11 +1749,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);
@@ -1844,7 +1858,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("申购编号");
@@ -3037,4 +3051,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