From 61b0fb5802f31e2f7673ddbf30e6d21220b6c7da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期日, 07 二月 2021 09:05:42 +0800
Subject: [PATCH] 仓库货柜修改

---
 src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java |   20 +++++++++++++++-----
 1 files changed, 15 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..9cde196 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java
@@ -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()");
@@ -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) {

--
Gitblit v1.9.2