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 | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 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 08238a8..629d2fb 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
@@ -3,22 +3,22 @@
<mapper namespace="com.zy.asrs.wms.asrs.mapper.ViewLocDetlMapper">
<select id="queryStock" resultType="map">
- select * from view_man_loc_detl ld
- where matnr = #{matnr}
- and freeze = 0
- <if test="batch != null and batch != ''">
- and batch = #{batch}
+ SELECT * FROM
+ (
+ SELECT id, loc_id, loc_no, mat_id, IFNULL(type_id, 4) AS type_id, work_qty, matnr, order_no, batch, anfme, host_id, memo,deleted, freeze
+ FROM
+ view_man_loc_detl
+ ) t
+ 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="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 test="batch != null and batch != ''">
+ AND t.batch = #{batch}
</if>
<if test="sortParam!=null and sortParam.size()>0">
<foreach collection="sortParam" item="item" open="order by " separator="," close=" ">
- ${item.name} ${item.value}
+ ${item.name} ${item.value}
</foreach>
</if>
</select>
@@ -26,12 +26,12 @@
<select id="getList" resultType="map">
select * from view_man_loc_detl ld
where matnr = #{matnr}
- <if test="batch!=null">
+ <if test="batch!=null and batch != ''">
and batch = #{batch}
</if>
<if test="param!=null and param.size()>0">
<foreach item="item" collection="param" index="index">
- <if test="item.value!=null">
+ <if test="item.value !=null and item.value != ''">
and ${item.name} = #{item.value}
</if>
</foreach>
@@ -63,7 +63,6 @@
</select>
-
<select id="listSuitableMat" resultType="map">
select * from view_man_loc_detl ld
where 1=1
@@ -78,4 +77,27 @@
</foreach>
</if>
</select>
+ <select id="queryFlatStock" resultType="map">
+ SELECT * FROM
+ (
+ SELECT id, loc_id, loc_no, mat_id, type_id, work_qty, matnr, order_no, batch, anfme, host_id, memo, freeze
+ FROM
+ view_man_loc_detl
+ WHERE
+ deleted = 0
+ 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 != ''">
+ AND t.matnr = #{matnr}
+ </if>
+ <if test="batch != null and batch != ''">
+ AND t.batch = #{batch}
+ </if>
+<!-- <if test="params != null and params.size() > 0">-->
+<!-- <foreach collection="params" item="item" open="in " separator="," close=" ">-->
+<!-- ${item.name} #{item.value}-->
+<!-- </foreach>-->
+<!-- </if>-->
+ </select>
</mapper>
--
Gitblit v1.9.1