订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

gdg

2021-02-22 d2be6e4afe1dba009b56f8555792f2823f9e4535

订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

 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("至少选择一个");

 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>

 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>


 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)"