From bc37418859ffcf1ce92a1176bc7c9b21a8e293b4 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期四, 04 二月 2021 17:48:29 +0800 Subject: [PATCH] 修改仓库下拉 --- src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java index 3560e31..b9afd31 100644 --- a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java @@ -51,14 +51,14 @@ * 选中的list */ private List<SysWarehouseContainer> selectedList; - + private List<SysController> controllers; private String warehouseType; private String warehouseName; private int action; - + /** 左右门危险性质显示Flag */ private int characterRenderedFlag; @@ -80,7 +80,7 @@ this.sysWarehouseContainer = this.sysWarehouseContainerService .getSysWarehouseContainer(this.selectedList.get(0).getId()); this.action = Constants.ACTION_EDIT; - + if(this.baseMetaService.getBaseMetaKey(this.sysWarehouseContainer.getType()).equals("200")) { // 智能柜时,左右门危险性质可配置 this.setCharacterRenderedFlag(1); @@ -89,7 +89,7 @@ this.sysWarehouseContainer.setCharacterLeft(null); this.sysWarehouseContainer.setCharacterRight(null); } - + RequestContext.getCurrentInstance().execute("PF('dialog').show()"); } @@ -101,24 +101,24 @@ FacesUtils.warn("新建对象为空。"); return; } - + boolean inputCheckFlag = false; - + if(this.sysWarehouseContainer.getContainerCode()==null || this.sysWarehouseContainer.getContainerCode().equals("")) { FacesUtils.error("请输入货柜条码", "请输入货柜条码"); inputCheckFlag = true; } - + if(this.sysWarehouseContainer.getInfoCode()==null || this.sysWarehouseContainer.getInfoCode().equals("")) { FacesUtils.error("请输入货柜状态码", "请输入货柜状态码"); inputCheckFlag = true; } - + if(this.sysWarehouseContainer.getName()==null || this.sysWarehouseContainer.getName().equals("")) { FacesUtils.error("请输入货柜名称", "请输入货柜名称"); inputCheckFlag = true; } - + if(inputCheckFlag) { return; } @@ -139,24 +139,24 @@ FacesUtils.warn("修改对象为空。"); return; } - + boolean inputCheckFlag = false; - + if(this.sysWarehouseContainer.getContainerCode()==null || this.sysWarehouseContainer.getContainerCode().equals("")) { FacesUtils.error("请输入货柜条码", "请输入货柜条码"); inputCheckFlag = true; } - + if(this.sysWarehouseContainer.getInfoCode()==null || this.sysWarehouseContainer.getInfoCode().equals("")) { FacesUtils.error("请输入货柜状态码", "请输入货柜状态码"); inputCheckFlag = true; } - + if(this.sysWarehouseContainer.getName()==null || this.sysWarehouseContainer.getName().equals("")) { FacesUtils.error("请输入货柜名称", "请输入货柜名称"); inputCheckFlag = true; } - + if(inputCheckFlag) { return; } @@ -193,7 +193,7 @@ FacesUtils.warn("操作失败。"); } } - + public void containerTypeChanged() { if(this.baseMetaService.getBaseMetaKey(this.sysWarehouseContainer.getType()).equals("200")) { @@ -264,10 +264,8 @@ } public List<SysController> getControllers() { - if(this.controllers == null) - { - this.controllers = this.sysControllerService.getAllControllerList(); - } + this.controllers = this.sysControllerService.getAllControllerList(); + return controllers; } -- Gitblit v1.9.2