李宇
2021-04-26 df938f06da12eddacfc9d2aee52d153222f5aa2c
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
@@ -1,5 +1,6 @@
package com.nanometer.smartlab.controller;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -128,8 +129,11 @@
               FacesUtils.warn("货柜条码已存在。");
               return;
            }
            this.sysWarehouseContainerService.insertSysWarehouseContainer(sysWarehouseContainer);
            if ("智能柜".equals(baseMetaService.getBaseMetaValue(sysWarehouseContainer.getType()))) {
               sysWarehouseContainerService.insertSysWarehouseContainer2(sysWarehouseContainer);
            }else{
               this.sysWarehouseContainerService.insertSysWarehouseContainer(sysWarehouseContainer);
            }
            FacesUtils.info("新建成功。");
            RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
@@ -166,8 +170,11 @@
               FacesUtils.warn("货柜条码已存在。");
               return;
            }
            this.sysWarehouseContainerService.updateSysWarehouseContainer(sysWarehouseContainer);
            if ("智能柜".equals(baseMetaService.getBaseMetaValue(sysWarehouseContainer.getType()))) {
               this.sysWarehouseContainerService.updateSysWarehouseContainer2(sysWarehouseContainer);
            }else{
               this.sysWarehouseContainerService.updateSysWarehouseContainer(sysWarehouseContainer);
            }
            FacesUtils.info("修改成功。");
            RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
@@ -185,7 +192,24 @@
            return;
         }
         this.sysWarehouseContainerService.deleteSysWarehouseContainer(this.selectedList);
         List<SysWarehouseContainer> sysWarehouseContainers = new ArrayList<>();
         List<SysWarehouseContainer> sysWarehouseContainerList = new ArrayList<>();
         for (SysWarehouseContainer sysWarehouseContainer : this.selectedList){
            if(this.baseMetaService.getBaseMetaKey(sysWarehouseContainer.getType()).equals("200")) {
               sysWarehouseContainers.add(sysWarehouseContainer);
            }else {
               sysWarehouseContainerList.add(sysWarehouseContainer);
            }
         }
         if (sysWarehouseContainers.size() > 0){
            this.sysWarehouseContainerService.deleteSysWarehouseContainer2(sysWarehouseContainers);
         }
         if (sysWarehouseContainerList.size() > 0){
            this.sysWarehouseContainerService.deleteSysWarehouseContainer(sysWarehouseContainerList);
         }
         FacesUtils.info("删除成功。");
      } catch (Exception e) {