bug修改

gdg

2021-02-04 14b64e57f9d3e644f931e67f4452957497ab34d2

bug修改

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

@@ -1541,6 +1541,7 @@
                //}
                this.opeWarehouseReserveService.claim(list, userId,projectNum);
            }

            if(list2.size()>0&&list2!=null){
                List<OpeApply> opeList=new ArrayList<>();
                //this.opeApplyService.getOpeApplyList(null,null,null,null,null)
@@ -2726,7 +2727,7 @@
                //    this.oriLaboratoryId = this.laboratory.get(0).getId();
                //}

                this.laboratoryId= laboratoryId==null?this.laboratory.get(0).getId():laboratoryId;
                this.laboratoryId = this.laboratory.get(0).getId();
                this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId);
            }else {
                this.oriLaboratoryId = null;

 src/main/webapp/warehouse_reagent_use.xhtml

@@ -24,7 +24,7 @@
                                    var="item"
                                    dropdown="true"
                                    styleClass="apply-user-autocomplete"
                                    itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : null}"
                                    itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : ' '}"
                                    itemValue="#{item.id}" forceSelection="true">
                        <p:ajax event="itemSelect" listener="#{warehouseStockMngController.resetLaboratory()}" process="@this" update="@this,experments,stacks" />
                        <p:column>
@@ -43,7 +43,7 @@
                         id="experments">
                        <f:selectItems value="#{warehouseStockMngController.laboratory}"
                            var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
                        <f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" update="stacks"/>
                        <f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" render="stacks"/>
                    </p:selectOneMenu>
                    <p:outputLabel value="实验室试剂柜："></p:outputLabel>
                    <p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"