From 5a0393cf6aea4da41a2a91606efa4d883bf3b53c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Sun, 07 Feb 2021 15:10:37 +0800
Subject: [PATCH] 删除仓库货柜
---
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
index b9afd31..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;
@@ -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) {
--
Gitblit v1.9.2