李宇
2021-02-07 5a0393cf6aea4da41a2a91606efa4d883bf3b53c
删除仓库货柜
已修改2个文件
28 ■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
@@ -190,12 +191,25 @@
                FacesUtils.warn("请选择数据。");
                return;
            }
            if ("智能柜".equals(baseMetaService.getBaseMetaValue(sysWarehouseContainer.getType()))) {
                this.sysWarehouseContainerService.deleteSysWarehouseContainer2(this.selectedList);
            }else{
                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) {
src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
@@ -173,7 +173,7 @@
            throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), ex);
        }
    }
    @Transactional(propagation = Propagation.REQUIRED)
    public boolean isSysWarehouseContainerExist(String containerCode, String editId) {
        try {
@@ -288,7 +288,9 @@
            }
        }
        //2.删除实验室临时存储柜
        sysLaboratoryContainerDao.deleteSysLaboratoryContainers(ids);
        if (ids.size() > 0){
            sysLaboratoryContainerDao.deleteSysLaboratoryContainers(ids);
        }
    }