From 798aa9213a565c6c5ffb411e3cef40a10f99e9d1 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 31 三月 2023 09:16:53 +0800
Subject: [PATCH] 新疆绿色智能综合研究所补充

---
 src/main/webapp/warehouse_mng.xhtml |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/warehouse_mng.xhtml b/src/main/webapp/warehouse_mng.xhtml
index 15aabd3..c8c96c7 100644
--- a/src/main/webapp/warehouse_mng.xhtml
+++ b/src/main/webapp/warehouse_mng.xhtml
@@ -67,6 +67,30 @@
 					<h:outputText
 						value="#{'楼号:'.concat(row.location1).concat(' - 地址号:'.concat(row.location2))}"></h:outputText>
 				</p:column>
+
+				<p:column headerText="温度最大值" width="50">
+					<h:outputText
+							value="#{row.temperatureMax}"></h:outputText>
+				</p:column>
+
+				<p:column headerText="温度最小值" width="50">
+					<h:outputText
+							value="#{row.temperatureMin}"></h:outputText>
+				</p:column>
+
+				<p:column headerText="湿度最大值" width="50">
+					<h:outputText
+							value="#{row.humidityMax}"></h:outputText>
+				</p:column>
+
+				<p:column headerText="湿度最小值" width="50">
+					<h:outputText
+							value="#{row.humidityMin}"></h:outputText>
+				</p:column>
+
+				<p:column headerText="负责部门">
+					<h:outputText value="#{baseMetaService.getBaseMetaValue(row.department)}"/>
+				</p:column>
 			</p:dataTable>
 		</p:panel>
 	</h:form>
@@ -87,7 +111,7 @@
 
 				<p:outputLabel value="仓库名"></p:outputLabel>
 				<p:inputText value="#{warehouseMngController.sysWarehouse.name}"
-					maxlength="100" required="true" requiredMessage="请输入仓库名"></p:inputText>
+					maxlength="100" required="true" requiredMessage="请输入仓库名" disabled="#{warehouseMngController.action==constants.ACTION_ADD?false:true}"></p:inputText>
 
 				<p:outputLabel value="状态码"></p:outputLabel>
 				<p:inputText value="#{warehouseMngController.sysWarehouse.infoCode}"
@@ -104,6 +128,33 @@
 				<p:outputLabel value="地址号"></p:outputLabel>
 				<p:inputText value="#{warehouseMngController.sysWarehouse.location2}"
 					maxlength="100"></p:inputText>
+
+				<p:outputLabel value="负责部门"></p:outputLabel>
+				<p:selectOneMenu value="#{warehouseMngController.sysWarehouse.department}"
+								 required="true" requiredMessage="请选择负责部门">
+					<f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
+								   var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+				</p:selectOneMenu>
+
+				<p:outputLabel value="温度最大值"></p:outputLabel>
+				<p:inputNumber value="#{warehouseMngController.sysWarehouse.temperatureMax}"
+							   modifyValueOnWheel="false"
+							   decimalPlaces="4"/>
+
+				<p:outputLabel value="温度最小值"></p:outputLabel>
+				<p:inputNumber value="#{warehouseMngController.sysWarehouse.temperatureMin}"
+							   modifyValueOnWheel="false"
+							   decimalPlaces="4"/>
+
+				<p:outputLabel value="湿度最大值"></p:outputLabel>
+				<p:inputNumber value="#{warehouseMngController.sysWarehouse.humidityMax}"
+							   modifyValueOnWheel="false"
+							   decimalPlaces="4"/>
+
+				<p:outputLabel value="湿度最大值"></p:outputLabel>
+				<p:inputNumber value="#{warehouseMngController.sysWarehouse.humidityMin}"
+							   modifyValueOnWheel="false"
+							   decimalPlaces="4"/>
 			</p:panelGrid>
 			<p:panel styleClass="btn">
 				<p:commandButton value="保存"
@@ -115,4 +166,4 @@
 		</h:form>
 	</p:dialog>
 </ui:composition>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.2