change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 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;
@@ -46,19 +47,19 @@
   /**
    * 数据模型
    */
   private SysWarehouseContainer sysWarehouseContainer;
   private SysWarehouseContainer sysWarehouseContainer=new SysWarehouseContainer();
   /**
    * 选中的list
    */
   private List<SysWarehouseContainer> selectedList;
	

   private List<SysController> controllers;

   private String warehouseType;
   private String warehouseName;

   private int action;
	

   /** 左右门危险性质显示Flag */
   private int characterRenderedFlag;

@@ -80,7 +81,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 +90,7 @@
         this.sysWarehouseContainer.setCharacterLeft(null);
         this.sysWarehouseContainer.setCharacterRight(null);
      }
		

      RequestContext.getCurrentInstance().execute("PF('dialog').show()");
   }

@@ -101,24 +102,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;
            }
@@ -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()");
@@ -139,24 +143,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;
            }
@@ -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) {
@@ -193,7 +217,7 @@
         FacesUtils.warn("操作失败。");
      }
   }
	

   public void containerTypeChanged() {

      if(this.baseMetaService.getBaseMetaKey(this.sysWarehouseContainer.getType()).equals("200")) {
@@ -222,6 +246,7 @@
                     list = sysWarehouseContainerService.getSysWarehouseContainerList(warehouseType,
                           warehouseName,null, first, pageSize);
                  }
                  selectedList = new ArrayList<>();
               } catch (Exception e) {
                  logger.error(e);
               }
@@ -230,17 +255,18 @@

            @Override
            public SysWarehouseContainer getRowData(String rowKey) {
               Iterator<SysWarehouseContainer> iterator = this.iterator();
               if (iterator != null) {
                  SysWarehouseContainer su = null;
                  while (iterator.hasNext()) {
                     su = iterator.next();
                     if (rowKey.equals(su.getId())) {
                        return su;
                     }
                  }
               }
               return null;
//               Iterator<SysWarehouseContainer> iterator = this.iterator();
//               if (iterator != null) {
//                  SysWarehouseContainer su = null;
//                  while (iterator.hasNext()) {
//                     su = iterator.next();
//                     if (rowKey.equals(su.getId())) {
//                        return su;
//                     }
//                  }
//               }
               Long id=Long.valueOf(rowKey);
               return sysWarehouseContainerService.getSysWarehouseContainer(id);
            }
         };
      }
@@ -264,10 +290,8 @@
   }

   public List<SysController> getControllers() {
      if(this.controllers == null)
      {
         this.controllers = this.sysControllerService.getAllControllerList();
      }
      this.controllers = this.sysControllerService.getAllControllerList();

      return controllers;
   }