From 26279d5b43efdd690542ef7a01d9d0cda77d394f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 15:00:23 +0800
Subject: [PATCH] 领用页面 订单申请人显示和默认申领人显示
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 3 ++-
src/main/webapp/warehouse_reagent_use_person.xhtml | 4 ++++
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java | 9 +++++++++
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 6 ++++--
4 files changed, 19 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 008d127..d88f662 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -47,8 +47,8 @@
/**
* Created by cmower on 17/11/20.
*/
-@Controller
@PropertySource(value = "WEB-INF/config.properties",encoding = "utf-8")
+@Controller
@Scope("session")
public class WarehouseStockMngController extends BaseController {
@@ -624,7 +624,7 @@
FacesUtils.info("至少选择一个");
return;
}
-
+ this.userId = getUser().getId();
this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW, Constants.PAGE_WAREHOUSE_STOCK_MNG);
}
//
@@ -649,6 +649,8 @@
}
}
checkTable = null;
+ //
+ this.userId = selectedTmpOrderList.get(0).getApplyUser();
this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index cda1831..b8fd00d 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -63,6 +63,7 @@
<result property="arrivalNum" column="arrival_num"></result>
<result property="status" column="status" typeHandler="com.nanometer.smartlab.entity.handler.ApplyStatusHandler"></result>
<result property="applyUserId" column="apply_user_id"></result>
+ <result property="applyUser" column="apply_user"></result>
<result property="arrivalTime" column="arrival_time"></result>
<result property="articleNumber" column="articleNumber"></result>
<result property="projectManage" column="projectManage"/>
@@ -408,7 +409,7 @@
bm1.meta_value productHome,
sr.dangerous_flag,
oa.num,
- oa.used,
+ oa.apply_user_id apply_user,
su.`name` apply_user_id,
su.project,
su1.`name` as projectManage,
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
index 389d25d..20d23da 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
@@ -39,6 +39,7 @@
private String project;
private String projectManage;
+ private String applyUser;
public ApplyStatus getStatus() {
return status;
@@ -231,4 +232,12 @@
public void setCacheUpdateList(List<OpeWarehouseReserve> cacheUpdateList) {
this.cacheUpdateList = cacheUpdateList;
}
+
+ public String getApplyUser() {
+ return applyUser;
+ }
+
+ public void setApplyUser(String applyUser) {
+ this.applyUser = applyUser;
+ }
}
diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index 4a40162..d4def34 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -92,6 +92,10 @@
<h:outputText value="#{row.articleNumber}"></h:outputText>
</p:column>
+ <p:column headerText="申领人">
+ <h:outputText value="#{row.applyUserId}"></h:outputText>
+ </p:column>
+
<p:column headerText="申请数量">
<h:outputText value="#{row.num}"></h:outputText>
</p:column>
--
Gitblit v1.9.2