From 61b0fb5802f31e2f7673ddbf30e6d21220b6c7da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Sun, 07 Feb 2021 09:05:42 +0800
Subject: [PATCH] 仓库货柜修改
---
src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
index 3560e31..9cde196 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
@@ -51,14 +51,14 @@
* 选中的list
*/
private List<SysWarehouseContainer> selectedList;
-
+
private List<SysController> controllers;
private String warehouseType;
private String warehouseName;
private int action;
-
+
/** 左右门危险性质显示Flag */
private int characterRenderedFlag;
@@ -80,7 +80,7 @@
this.sysWarehouseContainer = this.sysWarehouseContainerService
.getSysWarehouseContainer(this.selectedList.get(0).getId());
this.action = Constants.ACTION_EDIT;
-
+
if(this.baseMetaService.getBaseMetaKey(this.sysWarehouseContainer.getType()).equals("200")) {
// 智能柜时，左右门危险性质可配置
this.setCharacterRenderedFlag(1);
@@ -89,7 +89,7 @@
this.sysWarehouseContainer.setCharacterLeft(null);
this.sysWarehouseContainer.setCharacterRight(null);
}
-
+
RequestContext.getCurrentInstance().execute("PF('dialog').show()");
}
@@ -101,24 +101,24 @@
FacesUtils.warn("新建对象为空。");
return;
}
-
+
boolean inputCheckFlag = false;
-
+
if(this.sysWarehouseContainer.getContainerCode()==null || this.sysWarehouseContainer.getContainerCode().equals("")) {
FacesUtils.error("请输入货柜条码", "请输入货柜条码");
inputCheckFlag = true;
}
-
+
if(this.sysWarehouseContainer.getInfoCode()==null || this.sysWarehouseContainer.getInfoCode().equals("")) {
FacesUtils.error("请输入货柜状态码", "请输入货柜状态码");
inputCheckFlag = true;
}
-
+
if(this.sysWarehouseContainer.getName()==null || this.sysWarehouseContainer.getName().equals("")) {
FacesUtils.error("请输入货柜名称", "请输入货柜名称");
inputCheckFlag = true;
}
-
+
if(inputCheckFlag) {
return;
}
@@ -128,8 +128,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()");
@@ -139,24 +142,24 @@
FacesUtils.warn("修改对象为空。");
return;
}
-
+
boolean inputCheckFlag = false;
-
+
if(this.sysWarehouseContainer.getContainerCode()==null || this.sysWarehouseContainer.getContainerCode().equals("")) {
FacesUtils.error("请输入货柜条码", "请输入货柜条码");
inputCheckFlag = true;
}
-
+
if(this.sysWarehouseContainer.getInfoCode()==null || this.sysWarehouseContainer.getInfoCode().equals("")) {
FacesUtils.error("请输入货柜状态码", "请输入货柜状态码");
inputCheckFlag = true;
}
-
+
if(this.sysWarehouseContainer.getName()==null || this.sysWarehouseContainer.getName().equals("")) {
FacesUtils.error("请输入货柜名称", "请输入货柜名称");
inputCheckFlag = true;
}
-
+
if(inputCheckFlag) {
return;
}
@@ -166,8 +169,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()");
@@ -184,8 +190,12 @@
FacesUtils.warn("请选择数据。");
return;
}
+ if ("智能柜".equals(baseMetaService.getBaseMetaValue(sysWarehouseContainer.getType()))) {
+ this.sysWarehouseContainerService.deleteSysWarehouseContainer2(this.selectedList);
+ }else{
+ this.sysWarehouseContainerService.deleteSysWarehouseContainer(this.selectedList);
+ }
- this.sysWarehouseContainerService.deleteSysWarehouseContainer(this.selectedList);
FacesUtils.info("删除成功。");
} catch (Exception e) {
@@ -193,7 +203,7 @@
FacesUtils.warn("操作失败。");
}
}
-
+
public void containerTypeChanged() {
if(this.baseMetaService.getBaseMetaKey(this.sysWarehouseContainer.getType()).equals("200")) {
@@ -264,10 +274,8 @@
}
public List<SysController> getControllers() {
- if(this.controllers == null)
- {
- this.controllers = this.sysControllerService.getAllControllerList();
- }
+ this.controllers = this.sysControllerService.getAllControllerList();
+
return controllers;
}
--
Gitblit v1.9.2