From 7852471dd7eca58e49ab49cf6efdc8ad8cecd1c4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 25 一月 2021 17:32:04 +0800
Subject: [PATCH] 领用单信息补全
---
src/main/webapp/warehouse_reagent_use.xhtml | 33 ++++++++++------
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 2 -
src/main/webapp/warehouse_reagent_use_person.xhtml | 30 +++++++++-----
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 7 +++
4 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index c226a40..13fd67b 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1199,6 +1199,9 @@
printTable.put("phone", applyPersonInfo.get("phone"));
String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
printTable.put("receiptNumber", receiptNum);
+ printTable.put("project", applyPersonInfo.get("project"));
+ SysLaboratory lab = sysLaboratoryService.getSysLaboratory(laboratoryId);
+ printTable.put("lab", lab.getName());
this.receiptNumber = receiptNum;
for (OpeApplyReserve oar : selectedTmpOrderList) {
ApplyListDto lis = new ApplyListDto();
@@ -1445,9 +1448,11 @@
printTable.put("department", applyPersonInfo.get("meta_value"));
printTable.put("date", Utils.now("yyyy-MM-dd"));
printTable.put("phone", applyPersonInfo.get("phone"));
-
+ printTable.put("project", applyPersonInfo.get("project"));
+ SysLaboratory lab = sysLaboratoryService.getSysLaboratory(laboratoryId);
String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
printTable.put("receiptNumber", receiptNum);
+ printTable.put("lab", lab.getName());
this.receiptNumber = receiptNum;
//int size = 0;
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
index e1e86dc..17ab524 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -223,7 +223,6 @@
from ope_reagent_status as oa
<include refid="queryJoins3"/>
where oa.valid_flag = 1
- and (oa.status = -1 or oa.status = 0 )
<include refid="queryWhereSql3"/>
<if test="applyPerson != null and applyPerson != ''" >
and su.name like concat("%",#{applyPerson},"%")
@@ -263,7 +262,6 @@
<include refid="queryJoins2"/>
left join sys_user su on su.id = oa.user_id
where oa.valid_flag = 1
- and (oa.status = -1 or oa.status = 0 )
<include refid="queryWhereSql2"/>
<if test="applyPerson != null and applyPerson != ''" >
and su.name like concat("%",#{applyPerson},"%")
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index 504a5eb..a32a5f1 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -206,43 +206,52 @@
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
<div id="printTarget">
<div style=" margin: 10mm 10mm 0mm 2mm;">
- <h:form id="printDialog">
+ <h:form id="printDialog" style="width: 1100px">
<p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
<p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
- <div>
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px;">单据编号:</div>
- <div style="width: 300px;">
- <p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
+ <div>
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-right: 17px;">
+ <div style="width: 100px;">单据编号:</div>
+ <div>
+ <!-- <input style="border: 0;" value="#{warehouseStockMngController.printTable['receiptNumber']}"/>-->
+ <p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
<p:ajax event="valueChange" listener="#{warehouseStockMngController.receiptNumberChange()}" />
- </p:inputText></div>
+ </p:inputText>
</div>
</div>
+ </div>
<div style="margin: 10px 0;">
<div style="display: inline-flex;">
<div style="width: 100px;margin-left: 10px;">部门:</div>
<div style="width: 300px;">#{warehouseStockMngController.printTable['department']}</div>
</div>
+ <div style="display: inline-flex;">
+ <div style="width: 100px;">申购人:</div>
+ <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
+ </div>
<div style="display: inline-flex;float: right;">
<div style="width: 100px;">日期:</div>
- <div style="width: 300px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
+ <div style="width: 200px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
</div>
</div>
<div style="margin-bottom: 20px;">
<div style="display: inline-flex;">
- <div style="width: 100px;margin-left: 10px;">申购人:</div>
- <div style="width: 300px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
+ <div style="width: 100px;margin-left: 10px;">课题组</div>
+ <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
+ </div>
+ <div style="display: inline-flex;">
+ <div style="width: 100px;">使用地点:</div>
+ <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['lab']}</div>
</div>
<div style="display: inline-flex;float: right;">
<div style="width: 100px;">联系方式:</div>
- <div style="width: 300px;">
+ <div style="width: 200px;">
<input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
</div>
</div>
-
diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index 9214833..ddd84f7 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -116,14 +116,14 @@
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
<div id="printTarget">
<div style=" margin: 10mm 10mm 0mm 2mm;">
- <h:form id="printDialog">
+ <h:form id="printDialog" style="width: 1100px">
<p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
<p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
<div>
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-right: 17px;">
<div style="width: 100px;">单据编号:</div>
- <div style="width: 300px;">
+ <div>
<!-- <input style="border: 0;" value="#{warehouseStockMngController.printTable['receiptNumber']}"/>-->
<p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
<p:ajax event="valueChange" listener="#{warehouseStockMngController.receiptNumberChange()}" />
@@ -137,20 +137,28 @@
<div style="width: 100px;margin-left: 10px;">部门:</div>
<div style="width: 300px;">#{warehouseStockMngController.printTable['department']}</div>
</div>
+ <div style="display: inline-flex;">
+ <div style="width: 100px;">申购人:</div>
+ <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
+ </div>
<div style="display: inline-flex;float: right;">
<div style="width: 100px;">日期:</div>
- <div style="width: 300px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
+ <div style="width: 200px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
</div>
</div>
<div style="margin-bottom: 20px;">
<div style="display: inline-flex;">
- <div style="width: 100px;margin-left: 10px;">申购人:</div>
- <div style="width: 300px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
+ <div style="width: 100px;margin-left: 10px;">课题组</div>
+ <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
+ </div>
+ <div style="display: inline-flex;">
+ <div style="width: 100px;">使用地点:</div>
+ <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['lab']}</div>
</div>
<div style="display: inline-flex;float: right;">
<div style="width: 100px;">联系方式:</div>
- <div style="width: 300px;">
+ <div style="width: 200px;">
<input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
</div>
</div>
@@ -188,17 +196,17 @@
</p:column>
</p:dataTable>
- <div style="margin-top: 20px;">
+ <div style="margin-top: 20px;margin-right: 94px;">
<div style="display: flex;flex-direction: row;justify-content: flex-end;">
<div style="width: 100px">签收人:</div>
- <div style="width: 300px"></div>
+ <div style="width: 100px"></div>
</div>
</div>
- <div style="margin: 10px 0">
+ <div style="margin: 10px 94px 10px 0;">
<div style="display: flex;flex-direction: row;justify-content: flex-end;">
<div style="width: 100px">日期:</div>
- <div style="width: 300px"></div>
+ <div style="width: 100px"></div>
</div>
</div>
--
Gitblit v1.9.2