From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/controller/NodeController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index fad123f..b6836cf 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -348,7 +348,7 @@
EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
nodeEntityWrapper.eq("id",param.getValue());
nodeEntityWrapper.eq("name",param.getName());
- nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
+// nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
Node node = nodeService.selectOne(nodeEntityWrapper);
String[] string = node.getNamePath().split(",");
int tno=1; int no=1;
@@ -398,6 +398,11 @@
continue;
}
+ List<Node> nodeList = nodeService.selectList(new EntityWrapper<Node>().eq("name", locNo));
+ if (!Cools.isEmpty(nodeList)){
+ throw new CoolException("搴撲綅鍙烽噸澶�");
+ }
+
Date now = new Date();
Node node1 = new Node();
node1.setUuid(locNo);
@@ -416,10 +421,13 @@
node1.setRow1(r);
node1.setBay1(b);
node1.setLev1(l);
+
if (!nodeService.insert(node1)){
return R.error("鏁版嵁鎻掑叆澶辫触");
}
+
+
}
}
if (param.getName().equals("DT-B")){
--
Gitblit v1.9.1