From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:08 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
index ddae67c..629d2fb 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
@@ -9,19 +9,12 @@
FROM
view_man_loc_detl
) t
- WHERE t.deleted = 0 AND t.freeze = 0
+ WHERE t.deleted = 0 AND t.freeze = 0 AND type_id = #{type}
<if test="matnr != null and matnr != ''">
AND t.matnr = #{matnr}
</if>
<if test="batch != null and batch != ''">
AND t.batch = #{batch}
- </if>
- <if test="param!=null and param.size()>0">
- <foreach item="item" collection="param" index="index">
- <if test="item.value!=null and item.value != ''">
- and ${item.name} = #{item.value}
- </if>
- </foreach>
</if>
<if test="sortParam!=null and sortParam.size()>0">
<foreach collection="sortParam" item="item" open="order by " separator="," close=" ">
@@ -92,7 +85,7 @@
view_man_loc_detl
WHERE
deleted = 0
- AND type_id IN ( SELECT type_id FROM man_loc_area_type WHERE parent_id = #{typeId} OR id = #{typeId} )
+ AND type_id IN ( SELECT id FROM man_loc_area_type WHERE parent_id = #{typeId} OR id = #{typeId} )
) t
WHERE 1 = 1
<if test="matnr != null and matnr != ''">
--
Gitblit v1.9.1