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/controller/WarehouseContainerMngController.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 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) {

--
Gitblit v1.9.2