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/warehouse_stock_mng.xhtml | 198 ++++--------------------------------------------
1 files changed, 19 insertions(+), 179 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index 1be7e1a..8f23efc 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -49,7 +49,7 @@
</p:column>
<p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHomeName}"/>
+ <h:outputText value="#{row.reagent.productHome}"/>
</p:column>
<p:column headerText="供应商">
<h:outputText value="#{row.reagent.supplierName}"/>
@@ -57,12 +57,12 @@
<p:column headerText="规格">
<h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"/>
+ value="#{row.reagent.reagentFormat}"/>
</p:column>
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
+ value="#{''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)}"/>
</p:column>
<p:column headerText="批号">
@@ -85,7 +85,7 @@
<p:panelGrid styleClass="filter" columns="9">
<p:outputLabel value="试剂名称："></p:outputLabel>
- <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
+ <p:inputText value="#{warehouseStockMngController.reagentName}"></p:inputText>
<p:outputLabel value="供应商："></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.supplierId}">
@@ -110,11 +110,6 @@
disabled="#{warehouseStockMngController.editFlag==0}"
oncomplete="$('#showTab').css('display','block');"
update="@(.tempTable)"></p:commandButton>
- <p:commandButton value="入库" styleClass="ruku-btn"
- process="@form"
- disabled="#{warehouseStockMngController.editFlag==0}"
- actionListener="#{warehouseStockMngController.onDStoreBtnClick}"
- update=":centerRootPanel"></p:commandButton>
<p:commandButton update=":centerRootPanel" actionListener="#{warehouseStockMngController.onExportFileBtnClickNew}"
ajax="false" value="导出" styleClass="new-btn" />
<!--<p:commandButton value="导入" styleClass="import-btn" onclick="importStock()"
@@ -169,24 +164,24 @@
</p:column>
<p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHomeName}"></h:outputText>
+ <h:outputText value="#{row.reagent.productHome}"></h:outputText>
</p:column>
<p:column headerText="供应商">
<h:outputText value="#{row.reagent.supplierName}"></h:outputText>
</p:column>
<p:column headerText="危险性质">
- <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentCharacter)}"/>
+ <h:outputText value="#{row.reagent.reagentCharacter}"/>
</p:column>
<p:column headerText="规格">
<h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
+ value="#{row.reagent.reagentFormat}"></h:outputText>
</p:column>
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
+ value="#{''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)}"></h:outputText>
</p:column>
<p:column headerText="批号">
@@ -267,7 +262,7 @@
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
+ value="#{''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)}"/>
</p:column>
<p:column headerText="批号">
@@ -328,7 +323,7 @@
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
+ value="#{''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)}"/>
</p:column>
<p:column headerText="价格">
@@ -385,7 +380,7 @@
</style>
<p:outputLabel value="试剂名称："></p:outputLabel>
- <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
+ <p:inputText value="#{warehouseStockMngController.reagentName}"></p:inputText>
<p:outputLabel value="申领人："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.userName}"></p:inputText>
<p:outputLabel value="申购编号："></p:outputLabel>
@@ -447,7 +442,7 @@
paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
lazy="true" value="#{warehouseStockMngController.dataModelForPerson}" var="row"
selection="#{warehouseStockMngController.selectedListForPerson}" rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
+ emptyMessage="无数据" rows="10" pageLinks="5">
<p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
<p:column headerText="申购编号" width="150">
@@ -496,19 +491,23 @@
<h:outputText value="#{row.num}"></h:outputText>
</p:column>
+<!-- <p:column headerText="已领用数量">-->
+<!-- <h:outputText value="#{row.used}"></h:outputText>-->
+<!-- </p:column>-->
<p:column headerText="已领用数量">
- <h:outputText value="#{row.used}"></h:outputText>
+ <h:outputText value="#{warehouseStockMngController.getUsedCount(row.applyCode)}"></h:outputText>
</p:column>
+ getUsedCount
<p:column headerText="申领人">
- <h:outputText value="#{row.applyUserId}" />
+ <h:outputText value="#{row.applyUser}" />
</p:column>
<p:column headerText="订单状态">
<h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
</p:column>
<p:column headerText="课题组">
- <h:outputText value="#{row.project}" />
+ <h:outputText value="#{row.projectName}" />
</p:column>
<p:column headerText="课题组负责人">
<h:outputText value="#{row.projectManage}" />
@@ -523,165 +522,6 @@
</p:panel>
</h:form>
</p:tab>
-
-
-
- <!-- 目前领取记录查询是最新状态试剂表，应该是试剂履历表。目前客户不太需要这个画面，所以先去掉了 -->
- <!--
- <p:tab title="领取记录">
- <h:form id="warehouseStockLogForm">
- <p:panel styleClass="center-header" style="border-bottom:none;">
- <p:panelGrid styleClass="filter" columns="5">
-
- <p:outputLabel value="试剂名称："></p:outputLabel>
- <p:selectOneMenu value="#{warehouseStockMngController.reagentLogId}">
- <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
- <f:selectItems value="#{warehouseStockMngController.reagentSelectList}"
- var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
-
- <p:outputLabel value="申领人："></p:outputLabel>
- <p:selectOneMenu value="#{warehouseStockMngController.userLogId}">
- <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
- <f:selectItems value="#{warehouseStockMngController.applyUserSelectList}"
- var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
-
- <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
- </p:panelGrid>
- </p:panel>
-
- <p:panel styleClass="center-body">
- <p:dataTable id="warehouseStockLogDataTable" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.reagentStatusDataModel}"
- var="row" rowKey="#{row.id}" emptyMessage="无数据" rows="20" pageLinks="5">
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent.name}"></h:outputText>
- </p:column>
-
- <p:column headerText="CAS">
- <h:outputText value="#{row.reagent.cas}"></h:outputText>
- </p:column>
-
- <p:column headerText="供应商">
- <h:outputText value="#{row.reagent.supplierName}"></h:outputText>
- </p:column>
-
- <p:column headerText="规格">
- <h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
- </p:column>
-
- <p:column headerText="包装">
- <h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
- </p:column>
-
- <p:column headerText="批号">
- <h:outputText value="#{row.articleNumber}"></h:outputText>
- </p:column>
-
- <p:column headerText="价格">
- <h:outputText value="#{row.reagent.price}"></h:outputText>
- </p:column>
-
- <p:column headerText="条形码">
- <h:outputText value="#{row.reagentCode}" />
- </p:column>
-
- <p:column headerText="申领人">
- <h:outputText value="#{row.userName}" />
- </p:column>
- </p:dataTable>
- </p:panel>
- </h:form>
- </p:tab>
- -->
- <!--
-
- <p:tab title="订单领取">
- <h:form id="warehouseStockMngFormForPerson">
- <p:panel styleClass="center-header" style="border-bottom:none;">
- <p:panelGrid styleClass="filter" columns="5">
-
- <p:outputLabel value="试剂名称："></p:outputLabel>
- <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
- <p:outputLabel value="申领人："></p:outputLabel>
- <p:inputText value="#{warehouseStockMngController.userLogId}"></p:inputText>
-
- <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
- </p:panelGrid>
- </p:panel>
-
- <p:panel styleClass="center-body">
- <p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.dataModelForPerson}" var="row"
- selection="#{warehouseStockMngController.selectedListForPerson}" rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
- <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
-
- <p:column headerText="申购编号">
- <h:outputText value="#{row.applyCode}"></h:outputText>
- </p:column>
-
- <p:column headerText="产品编号">
- <h:outputText value="#{row.reagent.productSn}"></h:outputText>
- </p:column>
-
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent.name}"></h:outputText>
- </p:column>
-
- <p:column headerText="管制品">
- <h:outputText value="#{row.reagent.controlProducts}"></h:outputText>
- </p:column>
-
- <p:column headerText="规格型号">
- <h:outputText
- value="#{row.reagent.reagentFormat}"></h:outputText>
- </p:column>
-
- <p:column headerText="包装">
- <h:outputText
- value="#{row.reagent.mainMetering}"></h:outputText>
- </p:column>
-
- <p:column headerText="价格">
- <h:outputText value="#{row.reagent.price}"></h:outputText>
- </p:column>
-
- <p:column headerText="CAS">
- <h:outputText value="#{row.reagent.cas}"></h:outputText>
- </p:column>
-
- <p:column headerText="危险性质">
- <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
- </p:column>
-
- <p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHome}"></h:outputText>
- </p:column>
-
- <p:column headerText="申请数量">
- <h:outputText value="#{row.num}"></h:outputText>
- </p:column>
-
- <p:column headerText="已领用数量">
- <h:outputText value="#{row.used}"></h:outputText>
- </p:column>
-
- <p:column headerText="申领人">
- <h:outputText value="#{row.applyUserId}" />
- </p:column>
-
- </p:dataTable>
- </p:panel>
- </h:form>
- </p:tab>
-
- -->
</p:tabView>
</ui:composition>
</html>
--
Gitblit v1.9.2