From 14b64e57f9d3e644f931e67f4452957497ab34d2 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 04 二月 2021 17:47:16 +0800
Subject: [PATCH] bug修改

---
 src/main/webapp/warehouse_reagent_use.xhtml                                      |    4 ++--
 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index d88f662..4b4decd 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1541,6 +1541,7 @@
 				//}
 				this.opeWarehouseReserveService.claim(list, userId,projectNum);
 			}
+
 			if(list2.size()>0&&list2!=null){
 				List<OpeApply> opeList=new ArrayList<>();
 				//this.opeApplyService.getOpeApplyList(null,null,null,null,null)
@@ -2726,7 +2727,7 @@
 				//	this.oriLaboratoryId = this.laboratory.get(0).getId();
 				//}
 
-				this.laboratoryId= laboratoryId==null?this.laboratory.get(0).getId():laboratoryId;
+				this.laboratoryId = this.laboratory.get(0).getId();
 				this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId);
 			}else {
 				this.oriLaboratoryId = null;
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index 1e1f563..39f3acd 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -24,7 +24,7 @@
 									var="item"
 									dropdown="true"
 									styleClass="apply-user-autocomplete"
-									itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : null}"
+									itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : ' '}"
 									itemValue="#{item.id}" forceSelection="true">
 						<p:ajax event="itemSelect" listener="#{warehouseStockMngController.resetLaboratory()}" process="@this" update="@this,experments,stacks" />
 						<p:column>
@@ -43,7 +43,7 @@
 						 id="experments">
 						<f:selectItems value="#{warehouseStockMngController.laboratory}"
 							var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
-						<f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" update="stacks"/>
+						<f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" render="stacks"/>
 					</p:selectOneMenu>
 					<p:outputLabel value="实验室试剂柜:"></p:outputLabel>
 					<p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"

--
Gitblit v1.9.2