修改领用

李宇

2021-04-23 12862728f6123b2a9a927f6bad97317bc651d8c2

修改领用

 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java

@@ -2748,14 +2748,14 @@
        //getLaboratoryContainers();
    }

    public void setContainerId(){
    }
//    public void setContainerId(){
//    }
    public void resetLaboratoryContainers() {
        laboratoryContainers = null;
        //getLaboratoryContainers();
    }
    public List<SysLaboratory> getLaboratory() {
        if(userId != null && userId.trim().length() > 0)
         if(userId != null && userId.trim().length() > 0)
        {

            //Todo 修改申领人的实验室显示信息
@@ -2763,15 +2763,15 @@
            if(this.laboratory != null && this.laboratory.size() > 0)
            {
                //flag =true;
                //if(laboratoryId != null && laboratoryId.trim().length() > 0)
                //{
                //    this.oriLaboratoryId = this.laboratoryId;
                //}else
                //{
                //    this.oriLaboratoryId = this.laboratory.get(0).getId();
                //}
                if(laboratoryId != null && laboratoryId.trim().length() > 0)
                {
                    this.oriLaboratoryId = this.laboratoryId;
                }else
                {
                    this.laboratoryId = this.laboratory.get(0).getId();
                }

                this.laboratoryId = this.laboratory.get(0).getId();
//                this.laboratoryId = this.laboratory.get(0).getId();
                this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId);
            }else {
                this.oriLaboratoryId = null;
@@ -2791,7 +2791,7 @@
    }

    public List<SysLaboratoryContainer> getLaboratoryContainers() {
        if(laboratoryId != null && laboratoryId.trim().length() > 0)
         if(laboratoryId != null && laboratoryId.trim().length() > 0)
        {
            this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId);
        }

 src/main/webapp/warehouse_reagent_use.xhtml

@@ -48,7 +48,7 @@
                    <p:outputLabel value="实验室试剂柜："></p:outputLabel>
                    <p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"
                        >
                        <f:ajax listener="#{warehouseStockMngController.setContainerId}"/>
<!--                        <f:ajax listener="#{warehouseStockMngController.setContainerId}"/>-->
                        <f:selectItems value="#{warehouseStockMngController.laboratoryContainers}"
                            var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
                    </p:selectOneMenu>
@@ -64,8 +64,7 @@
                    <p:commandButton value="重置" process="@this" update="@form"
                        actionListener="#{warehouseStockMngController.onResetBtnClick}"
                        styleClass="reset-btn"></p:commandButton>
                    <p:commandButton value="保存" process="@this" update=":centerRootPanel"
                                     immediate="true"
                    <p:commandButton value="保存" process="@form" update=":centerRootPanel"
                        actionListener="#{warehouseStockMngController.onSaveBtnClick}"
                        styleClass="save-btn">
                        <p:confirm header="确认" message="确认操作？"></p:confirm>
@@ -104,7 +103,7 @@
                            }

                        }
						

                        function allSelected() {
                            selectFunc(num);
                            num++;
@@ -126,11 +125,11 @@
                                        .children("span").removeClass("ui-icon-blank").addClass("ui-icon-check")
                            }
                        }
						

                        function changeCount() {
                            $("#num").val($("#reagentCodeDialog td div[class*=ui-state-active]").size());
                        }
						

                        function change(element) {
                            var selected = element.checked;
                            var num = 0;
@@ -195,8 +194,7 @@
                </p:column>

                <p:column headerText="条形码">
                    <p:commandButton value="操作" styleClass="edit-btn" process="@this"
                                     immediate="true"
                    <p:commandButton value="操作" styleClass="edit-btn" process="@form"
                        actionListener="#{warehouseStockMngController.onReagentCodeBtnClick(row)}"
                        update=":reagentCodeDialog">
                    </p:commandButton>

 src/main/webapp/warehouse_reagent_use_person.xhtml

@@ -58,8 +58,7 @@
                    <p:commandButton value="重置" process="@this" update="@form"
                        actionListener="#{warehouseStockMngController.onResetBtnClick}"
                        styleClass="reset-btn"></p:commandButton>
                    <p:commandButton value="保存" process="@this" update=":centerRootPanel"
                                     immediate="true"
                    <p:commandButton value="保存" process="@form" update=":centerRootPanel"
                        actionListener="#{warehouseStockMngController.onSaveBtnClickForPerson}"
                        styleClass="save-btn">
                        <p:confirm header="确认" message="确认操作？"></p:confirm>
@@ -111,8 +110,7 @@
                </p:column>

                <p:column headerText="条形码">
                    <p:commandButton value="操作" styleClass="edit-btn" process="@this"
                                     immediate="true"
                    <p:commandButton value="操作" styleClass="edit-btn" process="@form"
                        actionListener="#{warehouseStockMngController.onReagentCodeBtnClickForPerson(row)}"
                        update=":reagentCodeDialogForPerson,@(.startReagentCode),@(.endReagentCode)">
                    </p:commandButton>