From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/order_input_warehouse.xhtml | 56 ++++++++++++++------------------------------------------
1 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/order_input_warehouse.xhtml b/src/main/webapp/order_input_warehouse.xhtml
index ee15bf2..e47274e 100644
--- a/src/main/webapp/order_input_warehouse.xhtml
+++ b/src/main/webapp/order_input_warehouse.xhtml
@@ -79,7 +79,7 @@
</p:column>
<p:column headerText="包装" width="80">
- <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"/>
+ <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)):''}"/>
</p:column>
<p:column headerText="CAS" width="80">
@@ -98,20 +98,23 @@
<h:outputText value="#{sysUserService.getSysUser(row.applyUserId).getName()}"/>
</p:column>
+ <p:column headerText="条形码开始" width="120">
+ <h:outputText value="#{row.startReagentCode}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="条形码结束" width="120">
+ <h:outputText value="#{row.endReagentCode}"></h:outputText>
+ </p:column>
+
<p:column headerText="到货数量" width="80">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{row.arrivalNum}" />
</f:facet>
<f:facet name="input">
- <p:inputText value="#{row.arrivalNum}"
- styleClass="arrivalNum"
- minValue="0"
- required="true"
- requiredMessage="请输入到货数量"
- onkeyup="this.value = #{row.num}">
- <p:ajax event="keyup" listener="#{warehouseStockMngController.setArrival(row)}"/>
- </p:inputText>
+ <p:inputNumber value="#{row.arrivalNum}"
+ minValue="0" decimalPlaces="0" style="width: 100%"
+ required="true" requiredMessage="请输入到货数量"/>
</f:facet>
</p:cellEditor>
</p:column>
@@ -128,38 +131,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="条形码开始" width="200">
- <p:cellEditor>
- <f:facet name="output">
- <h:outputText value="#{row.startReagentCode2}"/>
- </f:facet>
- <f:facet name="input">
- <p:inputText value="#{row.startReagentCode2}"
- maxlength="24"
- size="24"
- styleClass="reagentCodeStart"
- onkeyup="this.value = this.value.replace(/[^0-9A-F]/,'')">
- <p:ajax event="change" listener="#{warehouseStockMngController.reagentStartCodeChange(row)}" update="@this,@(.reagentCodeEnd),@(.arrivalNum)"/>
- </p:inputText>
- </f:facet>
- </p:cellEditor>
- </p:column>
- <p:column headerText="条形码结束" width="200">
- <p:cellEditor>
- <f:facet name="output">
- <h:outputText value="#{row.endReagentCode2}" />
- </f:facet>
- <f:facet name="input">
- <p:inputText value="#{row.endReagentCode2}"
- maxlength="24"
- size="24"
- onkeyup="this.value = this.value.replace(/\D/g,'')"
- styleClass="reagentCodeEnd">
- </p:inputText>
- </f:facet>
- </p:cellEditor>
- </p:column>
<p:column headerText="仓库名" width="120">
<p:cellEditor>
@@ -167,7 +139,7 @@
<h:outputText value="#{warehouseStockMngController.formatWarehouseName(row.houseId)}"/>
</f:facet>
<f:facet name="input">
- <p:selectOneMenu value="#{row.houseId}" style="width: 110px">
+ <p:selectOneMenu value="#{row.houseId}" style="width: 110px" required="true" requiredMessage="请选择仓库">
<p:ajax event="change" process="@this"
listener="#{warehouseStockMngController.onWarehouseSelectChange(row.houseId)}"
update="containerSelect"/>
@@ -184,7 +156,7 @@
<h:outputText value="#{warehouseStockMngController.formatWarehouseContainerName(row.containerId)}" />
</f:facet>
<f:facet name="input">
- <p:selectOneMenu id="containerSelect" value="#{row.containerId}" style="width: 110px">
+ <p:selectOneMenu id="containerSelect" value="#{row.containerId}" style="width: 110px" required="true" requiredMessage="请选择货柜">
<f:selectItems value="#{warehouseStockMngController.warehouseContainerList}" var="item"
itemValue="#{item.id}" itemLabel="#{item.containerCode}"/>
</p:selectOneMenu>
--
Gitblit v1.9.2