From 971dc3eb422fb38ffe8205ed60283c85036fde36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:10:58 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期
---
src/main/resources/mapper/ManLocDetlMapper.xml | 156 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 147 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index b246a85..395c9db 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -28,9 +28,12 @@
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
- <result column="update_time" property="modiTime" />
+ <result column="modi_time" property="modiTime" />
<result column="memo" property="memo" />
-
+ <result column="owner" property="owner" />
+ <result column="payment" property="payment" />
+ <result column="real_anfme" property="realAnfme" />
+ <result column="order_no" property="orderNo" />
</resultMap>
<sql id="locDetlCondition">
@@ -40,18 +43,44 @@
<if test="loc_no != null and loc_no != ''">
and mld.loc_no like concat('%',#{loc_no},'%')
</if>
+ <if test="locNo != null and locNo != ''">
+ and mld.loc_no like concat('%',#{loc_no},'%')
+ </if>
<if test="matnr != null and matnr != ''">
and mld.matnr like concat('%',#{matnr},'%')
</if>
<if test="maktx != null and maktx != ''">
and mld.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="zpallet != null and zpallet != ''">
+ and mld.zpallet like concat('%',#{zpallet},'%')
+ </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},'%')
+ </if>
+ <if test="locNo != null and locNo != ''">
+ and v.loc_no like concat('%',#{loc_no},'%')
+ </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>
- <select id="listByPage" resultMap="BaseResultMap">
+ <select id="listByPage" resultMap="BaseResultMap" parameterType="java.util.Map">
select * from
(
SELECT
@@ -62,8 +91,7 @@
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})
<include refid="locDetlCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -76,8 +104,7 @@
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})
<include refid="locDetlCondition"></include>
</select>
@@ -219,10 +246,69 @@
</select>
<select id="selectLocDetlSumQty" resultType="java.lang.Double"></select>
- <select id="selectLocNo0" resultType="com.zy.asrs.entity.ManLocDetl">
+ <select id="selectLocNo0" resultMap="BaseResultMap">
select * from man_loc_detl
where loc_no = #{locNo}
and matnr = #{matnr}
+ </select>
+ <select id="selectItem" resultMap="BaseResultMap">
+ select top 1 * from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ <if test="batch!=null and batch!='' ">
+ and batch = #{batch}
+ </if>
+ <!-- <choose>-->
+ <!-- <when test="batch != null and batch != ''">-->
+ <!-- and batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (batch IS NULL OR batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+ </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>
@@ -230,10 +316,62 @@
update man_loc_detl set loc_no = #{locNo}
where node_id = #{nodeId}
</update>
- <update id="deleteLocNo0">
+
+ <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>
+
+ <select id="selectInventory" resultMap="BaseResultMap">
+ select top 1 * from man_loc_detl
+ where loc_no=#{LocNo}
+ and 1=1
+ and matnr=#{Matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </select>
+ <delete id="deleteDatailed">
+ delete from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </delete>
+
+ <update id="increase">
+ update man_loc_detl
+ set anfme= #{anfme}
+ , modi_time = getdate()
+ ,weight=#{weight}
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+<!-- <choose>-->
+<!-- <when test="batch != null and batch!='' ">-->
+<!-- and batch = #{batch}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (batch IS NULL OR batch = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
</update>
</mapper>
--
Gitblit v1.9.1