From bb3513b191c966dc0f63076a63e837a3c00da3da Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 八月 2023 12:54:44 +0800
Subject: [PATCH] #平库库位初始化

---
 src/main/java/com/zy/asrs/controller/NodeController.java |    4 ++--
 src/main/resources/mapper/LocMastMapper.xml              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 81a8d29..f045756 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -352,7 +352,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;
@@ -389,7 +389,7 @@
                         }
 
                     }else {
-                        locNo = param.getName()+"-" +String.format("%02d", b) + String.format("%02d", r) + String.format("%02d", l);
+                        locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
                     }
 
 
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index e3fde58..d217db3 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -96,7 +96,7 @@
         SELECT * FROM asr_node_loc_DT_B_view WHERE lev1 = #{lev}
     </select>
     <select id="selectNodeEByLev" resultMap="BaseResultMap">
-        SELECT * FROM asr_node_loc_DT_E_view
+        SELECT * FROM asr_node_loc_DT_E_view WHERE lev1 = #{lev}
     </select>
 
 

--
Gitblit v1.9.1