From 89e4e43782d84b55ed3a4ab5d096b00d88f8f155 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 06 十一月 2020 14:53:13 +0800
Subject: [PATCH] bug：从历史的申购再次申购 出现申购价格为空的情况 已修复
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 2 +-
src/main/webapp/apply_mng_new.xhtml | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index e639b22..77ceb4b 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -153,7 +153,7 @@
<select id="getOpeApplyList" parameterType="java.util.Map" resultMap="OpeApply">
select oa.*,sys.name as secondUserName,
- sr.name as reagentName, sr.cas as reagentCas, sr.reagent_type as reagentType, sr.reagent_character as reagentCharacter, sr.supplier_id as reagentSupplierId,
+ sr.name as reagentName,sr.price as reagentPrice ,sr.cas as reagentCas, sr.reagent_type as reagentType, sr.reagent_character as reagentCharacter, sr.supplier_id as reagentSupplierId,
sr.reagent_format as reagentFormat, sr.main_metering as reagentMainMetering, sr.reagent_unit as reagentUnit, sr.per_box as reagentPerBox,
sr.memo as reagentMemo, sr.valid_flag as reagentValidFlag, sr.create_time as reagentCreateTime, sr.update_time as reagentUpdateTime, sr.product_sn as reagentProductSn,
sr.dangerous_flag as reagentDangerousFlag,sr.control_products as controlProducts,sr.product_home as productHome,
diff --git a/src/main/webapp/apply_mng_new.xhtml b/src/main/webapp/apply_mng_new.xhtml
index 77f1661..bdad796 100644
--- a/src/main/webapp/apply_mng_new.xhtml
+++ b/src/main/webapp/apply_mng_new.xhtml
@@ -68,7 +68,7 @@
</p:column>
<p:column headerText="含税售价">
- <h:outputText value="#{row.reagent!=null?row.reagent.price:''}"></h:outputText>
+ <h:outputText value="#{row.reagent.price}"></h:outputText>
</p:column>
<p:column headerText="CAS号">
@@ -438,7 +438,7 @@
</h:form>
</p:dialog>
</p:tab>
- <p:tab title="申请履历">
+ <p:tab title="申请履历">`
<h:form id="applyMngNewHistoryForm">
<p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
@@ -491,10 +491,14 @@
<h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
</p:column>
- <p:column headerText="含税售价">
+ <p:column headerText="试剂单价">
<h:outputText value="#{row.reagent!=null?row.reagent.price:''}"></h:outputText>
</p:column>
+ <p:column headerText="含税售价">
+ <h:outputText value="#{row.applyPrice}"></h:outputText>
+ </p:column>
+
<p:column headerText="每箱数量">
<h:outputText value="#{row.reagent!=null?row.reagent.perBox:''}"></h:outputText>
</p:column>
--
Gitblit v1.9.2