From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 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..fb0ddc7 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;
@@ -46,7 +47,7 @@
/**
* 数据模型
*/
- private SysWarehouseContainer sysWarehouseContainer;
+ private SysWarehouseContainer sysWarehouseContainer=new SysWarehouseContainer();
/**
* 选中的list
*/
@@ -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) {
@@ -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);
}
};
}
--
Gitblit v1.9.2