From e96735d51730b816041a6123e865c259856b4781 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 15:30:02 +0800
Subject: [PATCH] #上架规则完成

---
 src/main/resources/mapper/NodeMapper.xml                    |    6 +++++-
 src/main/resources/mapper/OrderDetlMapper.xml               |    6 +++---
 src/main/java/com/zy/asrs/mapper/NodeMapper.java            |    5 ++++-
 src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java |    4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/NodeMapper.java b/src/main/java/com/zy/asrs/mapper/NodeMapper.java
index bdea6f5..7a42316 100644
--- a/src/main/java/com/zy/asrs/mapper/NodeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/NodeMapper.java
@@ -19,5 +19,8 @@
 
     Integer listByPageCount(Map<String, Object> map);
 
-    List<String> getRommendLoc(@Param("matnr") String matnr);
+
+    List<String> getRommendLoc(@Param("rowBeg") Integer rowBeg,@Param("rowEnd") Integer rowEnd
+            ,@Param("bayBeg") Integer bayBeg,@Param("bayEnd") Integer bayEnd
+            ,@Param("levBeg") Integer levBeg,@Param("levEnd") Integer levEnd);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index 329ceec..1c13db3 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -230,7 +230,7 @@
     @Override
     public List<String> getRemmendLoc(String matnr) {
         LocRule locRule = locRuleService.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr));
-        this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
-        return
+        List<String> list = this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
+        return list;
     }
 }
diff --git a/src/main/resources/mapper/NodeMapper.xml b/src/main/resources/mapper/NodeMapper.xml
index 7b6abd1..544e781 100644
--- a/src/main/resources/mapper/NodeMapper.xml
+++ b/src/main/resources/mapper/NodeMapper.xml
@@ -84,7 +84,11 @@
     </select>
     <select id="getRommendLoc" resultType="java.lang.String">
         select name from man_node
-        where level = 3 and parent_name = 'C'
+        where level = 3
+        and (row1 >=#{rowBeg}  and row1 &lt;= #{rowEnd})
+        and (bay1 >=#{bayBeg}  and bay1 &lt;= #{bayEnd})
+        and (lev1 >=#{levBeg}  and lev1 &lt;= #{levEnd})
+
     </select>
 
 </mapper>
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index c2043b0..72a0ebd 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -71,9 +71,9 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <if test="batch!=null and batch!=''">
-            and batch = #{batch}
-        </if>
+<!--        <if test="batch!=null and batch!=''">-->
+<!--            and batch = #{batch}-->
+<!--        </if>-->
     </select>
 
     <select id="selectWorkingDetls" resultMap="BaseResultMap">

--
Gitblit v1.9.1