From 5a0393cf6aea4da41a2a91606efa4d883bf3b53c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期日, 07 二月 2021 15:10:37 +0800
Subject: [PATCH] 删除仓库货柜
---
src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java | 6 ++++--
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java | 22 ++++++++++++++++++----
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
index 9cde196..179cc17 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
+++ b/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) {
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
index 9dc584a..df9e821 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
+++ b/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);
+ }
}
--
Gitblit v1.9.2