From fb57e7836338304b16c09fec4fb5c68fb688c39e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 14:03:24 +0800
Subject: [PATCH] 1.新增分区查询 2.任务档新增分区字段
---
src/main/resources/mapper/ManLocDetlMapper.xml | 141 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 137 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index bfa79c1..cd6c105 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -38,7 +38,24 @@
and mld.host_id = #{host_id}
</if>
<if test="loc_no != null and loc_no != ''">
- and mld.loc_no like concat('%',#{loc_no},'%')
+ and (
+ mld.loc_no like concat('%',#{loc_no},'%')
+ or exists (
+ select 1 from asr_loc_mast alm
+ where alm.loc_no = mld.loc_no
+ and alm.loc_alias like concat('%',#{loc_no},'%')
+ )
+ )
+ </if>
+ <if test="locNo != null and locNo != ''">
+ and (
+ mld.loc_no like concat('%',#{locNo},'%')
+ or exists (
+ select 1 from asr_loc_mast alm
+ where alm.loc_no = mld.loc_no
+ and alm.loc_alias like concat('%',#{locNo},'%')
+ )
+ )
</if>
<if test="matnr != null and matnr != ''">
and mld.matnr like concat('%',#{matnr},'%')
@@ -48,6 +65,40 @@
</if>
<if test="startTime!=null and endTime!=null">
and mld.update_time between #{startTime} and #{endTime}
+ </if>
+ </sql>
+ <sql id="locDetlCondition2">
+ <if test="host_id != null and host_id != ''">
+ and v.host_id = #{host_id}
+ </if>
+ <if test="loc_no != null and loc_no != ''">
+ and (
+ v.loc_no like concat('%',#{loc_no},'%')
+ or exists (
+ select 1 from asr_loc_mast alm
+ where alm.loc_no = v.loc_no
+ and alm.loc_alias like concat('%',#{loc_no},'%')
+ )
+ )
+ </if>
+ <if test="locNo != null and locNo != ''">
+ and (
+ v.loc_no like concat('%',#{locNo},'%')
+ or exists (
+ select 1 from asr_loc_mast alm
+ where alm.loc_no = v.loc_no
+ and alm.loc_alias like concat('%',#{locNo},'%')
+ )
+ )
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and v.matnr like concat('%',#{matnr},'%')
+ </if>
+ <if test="maktx != null and maktx != ''">
+ and v.maktx like concat('%',#{maktx},'%')
+ </if>
+ <if test="startTime!=null and endTime!=null">
+ and v.update_time between #{startTime} and #{endTime}
</if>
</sql>
@@ -62,8 +113,8 @@
LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
LEFT JOIN man_tag mt ON mm.tag_id = mt.id
WHERE 1=1
- AND (CHARINDEX(','+#{node_id}+',', ','+mn.path+',') > 0 OR mn.id = #{node_id})
- AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
+ AND (CHARINDEX(','+#{node_id}+',', ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
<include refid="locDetlCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -197,7 +248,14 @@
and a.node_id like '%' + #{node_id} + '%'
</if>
<if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
+ and (
+ a.loc_no like '%' + #{loc_no} + '%'
+ or exists (
+ select 1 from asr_loc_mast alm
+ where alm.loc_no = a.loc_no
+ and alm.loc_alias like '%' + #{loc_no} + '%'
+ )
+ )
</if>
<if test="matnr!=null and matnr!='' ">
and a.matnr like '%' + #{matnr} + '%'
@@ -219,4 +277,79 @@
</select>
<select id="selectLocDetlSumQty" resultType="java.lang.Double"></select>
+ <select id="selectLocNo0" resultMap="BaseResultMap">
+ select * from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ </select>
+ <select id="selectItem0" resultType="com.zy.asrs.entity.ManLocDetl">
+ select top 1 * from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ </select>
+
+ <select id="listByOutPage" resultMap="BaseResultMap">
+ select * from
+ (
+ SELECT
+ ROW_NUMBER() over (order by mld.create_time desc) as row,
+ mld.*
+ FROM man_loc_detl mld
+ LEFT JOIN man_node mn ON mld.node_id = mn.id
+ LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
+ LEFT JOIN man_tag mt ON mm.tag_id = mt.id
+ WHERE 1=1
+ <include refid="locDetlCondition"></include>
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+ <select id="listByOutPageCount" resultType="java.lang.Long">
+ select
+ count(1)
+ FROM man_loc_detl mld
+ LEFT JOIN man_node mn ON mld.node_id = mn.id
+ LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
+ LEFT JOIN man_tag mt ON mm.tag_id = mt.id
+ WHERE 1=1
+ <include refid="locDetlCondition"></include>
+ </select>
+ <select id="selectAllPage" resultMap="BaseResultMap">
+ select * from
+ (
+ SELECT
+ ROW_NUMBER() over (order by v.loc_no desc) as row,
+ v.*
+ FROM [dbo].[man_view_asrs_saas] v
+ WHERE 1=1
+ <include refid="locDetlCondition2"></include>
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+ <select id="selectAllPageSize" resultType="java.lang.Long">
+ select
+ count(1)
+ FROM [dbo].[man_view_asrs_saas] v
+ WHERE 1=1
+ <include refid="locDetlCondition2"></include>
+ </select>
+
+
+ <update id="updateLocNo0">
+ update man_loc_detl set loc_no = #{locNo}
+ where node_id = #{nodeId}
+ </update>
+ <update id="updateLocNo0">
+ update man_loc_detl set loc_no = #{newLocNo}
+ where loc_no = #{oldLocNo}
+ </update>
+
+ <delete id="deleteLocNo0">
+ delete from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ </delete>
+
+ <update id="updateAnfme0">
+ update man_loc_detl set anfme = #{anfme}
+ where node_id = #{nodeId} ;
+ </update>
+
</mapper>
--
Gitblit v1.9.1