From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 22 二月 2021 10:34:59 +0800
Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 2 +-
src/main/webapp/warehouse_stock_mng.xhtml | 11 +++++++++--
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 11 +++++++++++
src/main/webapp/warehouse_reagent_direct_store.xhtml | 5 ++++-
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index d88f662..527e594 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -531,6 +531,13 @@
selectedTmpOrderList = null;
}
+ public void hideOrderTmp() {
+ //清空
+ selectedTmpOrderList = null;
+ //隐藏
+ RequestContext.getCurrentInstance().execute("document.getElementById('showTabOrder').style.display='none'");
+ }
+
public void clearInputStorageTmp(){
selectedInputStorageTmpOrderList = null;
}
@@ -563,6 +570,10 @@
}
+ public void hide(){
+ selectedTmpList = null;
+ RequestContext.getCurrentInstance().execute("document.getElementById('showTab').style.display='none'");
+ }
public void cancelOrderTmp(){
if (trulySelectedOrderList == null || trulySelectedOrderList.size()<=0){
FacesUtils.info("至少选择一个");
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 4fc53ba..dbc5d1a 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -264,7 +264,7 @@
<if test="productSn != null and productSn != ''">
and sr.product_sn like concat("%", #{productSn} ,"%")
</if>
- ORDER BY sr.create_time desc
+ ORDER BY length(sr.name),sr.create_time desc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
diff --git a/src/main/webapp/warehouse_reagent_direct_store.xhtml b/src/main/webapp/warehouse_reagent_direct_store.xhtml
index 03b9bd3..d36987c 100644
--- a/src/main/webapp/warehouse_reagent_direct_store.xhtml
+++ b/src/main/webapp/warehouse_reagent_direct_store.xhtml
@@ -184,13 +184,16 @@
<p:tabView dynamic="true" style="margin-left: 26px">
<p:tab title="试剂库">
<h:form id="applyMngNewReagentForm">
- <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
+ <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="7" style="margin-left: -18px">
<p:outputLabel value="试剂名称："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.applyNewReagentName}"></p:inputText>
<p:outputLabel value="CAS："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.applyNewCas}"></p:inputText>
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
+
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index c5d2f4d..71d49af 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -15,7 +15,10 @@
<div id ="showTab" style="display: none">
<h:form id="tmp">
<p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn">
+ <p:panelGrid columns="4" styleClass="btn">
+ <p:commandButton value="返回" styleClass="import-btn" process="@form"
+ actionListener="#{warehouseStockMngController.hide}"
+ update="@(.tempTable)"/>
<p:commandButton value="删除" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.cancel}"
update="@(.tempTable)"/>
@@ -196,7 +199,11 @@
<div id ="showTabOrder" style="display: none">
<h:form id="tmpOrder" styleClass="tmpOrder">
<p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn">
+ <p:panelGrid columns="4" styleClass="btn">
+ <p:commandButton value="返回" styleClass="import-btn" process="@form"
+ actionListener="#{warehouseStockMngController.hideOrderTmp}"
+ update="@(.tmpOrder)"
+ />
<p:commandButton value="删除" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.cancelOrderTmp}"
update="@(.tmpOrder)"
--
Gitblit v1.9.2