From bd3b23b214c7090d83c91f9b9a172d4f548033dd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 27 十月 2025 16:44:45 +0800
Subject: [PATCH] 13
---
src/main/resources/mapper/LocDetlMapper.xml | 208 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 175 insertions(+), 33 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 67a1dcf..ef51f89 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,33 +44,107 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+
+
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="pg_no" property="sPgNO" />
+ <result column="pro_type" property="proType" />
+ <result column="out_order_no" property="outOrderNo" />
+ <result column="lu_hao" property="luHao" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
</resultMap>
<sql id="batchSeq">
<choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
+ <when test="locDetl.batch != null and locDetl.batch != ''">
+ and batch = #{locDetl.batch}
</when>
<otherwise>
and (batch IS NULL OR batch = '')
</otherwise>
</choose>
+
+ <choose>
+ <when test="locDetl.proType != null and locDetl.proType != ''">
+ and pro_type = #{locDetl.proType}
+ </when>
+ <otherwise>
+ and (pro_type IS NULL OR pro_type = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.luHao != null and locDetl.luHao != ''">
+ and lu_hao = #{locDetl.luHao}
+ </when>
+ <otherwise>
+ and (lu_hao IS NULL OR lu_hao = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.packing != null and locDetl.packing != ''">
+ and packing = #{locDetl.packing}
+ </when>
+ <otherwise>
+ and (packing IS NULL OR packing = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.sPgNO != null and locDetl.sPgNO != ''">
+ and pg_no = #{locDetl.sPgNO}
+ </when>
+ <otherwise>
+ and (pg_no IS NULL OR pg_no = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.outOrderNo != null and locDetl.outOrderNo != ''">
+ and out_order_no = #{locDetl.outOrderNo}
+ </when>
+ <otherwise>
+ and (out_order_no IS NULL OR out_order_no = '')
+ </otherwise>
+ </choose>
</sql>
- <select id="selectItem" resultMap="BaseResultMap">
+<!-- <select id="selectItem" resultMap="BaseResultMap">-->
+<!-- select top 1 *-->
+<!-- from asr_loc_detl-->
+<!-- where 1=1-->
+<!-- and loc_no = #{locNo}-->
+<!-- and matnr = #{matnr}-->
+<!-- <include refid="batchSeq"></include>-->
+<!-- </select>-->
+
+ <select id="selectItem2" resultMap="BaseResultMap">
select top 1 *
from asr_loc_detl
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ </select>
+
+ <select id="selectItem3" resultMap="BaseResultMap">
+ select *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
</select>
<delete id="deleteItem">
delete from asr_loc_detl
where 1=1
and loc_no = #{locNo}
- and matnr = #{matnr}
+ and matnr = #{locDetl.matnr}
<include refid="batchSeq"></include>
</delete>
@@ -80,7 +154,7 @@
, modi_time = getdate()
where 1=1
and loc_no = #{locNo}
- and matnr = #{matnr}
+ and matnr = #{locDetl.matnr}
<include refid="batchSeq"></include>
</update>
@@ -93,6 +167,9 @@
</if>
<if test="maktx!=null and maktx!='' ">
and a.maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="model!=null and model!='' ">
+ and a.model like '%' + #{model} + '%'
</if>
<if test="anfme!=null and anfme!='' ">
and a.anfme like '%' + #{anfme} + '%'
@@ -108,6 +185,16 @@
</if>
<if test="specs!=null and specs!='' ">
and a.specs like '%' + #{specs} + '%'
+ </if>
+
+ <if test="sPgNO!=null and sPgNO!='' ">
+ and a.pg_no like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo!=null and outOrderNo!='' ">
+ and a.out_order_no like '%' + #{outOrderNo} + '%'
+ </if>
+ <if test="zpallet!=null and zpallet!='' ">
+ and a.zpallet like '%' + #{zpallet} + '%'
</if>
</sql>
@@ -208,25 +295,42 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
- and a.matnr = #{matnr}
-<!-- <choose>-->
-<!-- <when test="batch != null and batch != ''">-->
-<!-- and a.batch = #{batch}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (a.batch IS NULL OR a.batch = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
+
+ <!-- <choose>-->
+ <!-- <when test="batch != null and batch != ''">-->
+ <!-- and a.batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (a.batch IS NULL OR a.batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+
+
+ <if test="sPgNO != null and sPgNO != ''">
+ and a.pg_no = #{sPgNO}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
- <if test="orderNo != null and orderNo != ''">
- and a.order_no = #{orderNo}
+ <!-- <choose>-->
+ <!-- <when test="batch != null and batch != ''">-->
+ <!-- and batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (batch IS NULL OR batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+ <!-- <if test="orderNo != null and orderNo != ''">-->
+ <!-- and a.order_no = #{orderNo}-->
+ <!-- </if>-->
+ <if test="matnr != null and matnr != ''">
+ and a.matnr = #{matnr}
+-- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
</if>
<if test="locNos != null and locNos.size > 0">
and b.loc_no not in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
@@ -413,36 +517,74 @@
<id column="asrsQty" property="lkQty" />
<id column="erpQty" property="erpQty" />
+ <id column="pgNo" property="pgNo" />
+ <id column="outOrderNo" property="outOrderNo" />
+ <id column="batch" property="batch" />
+ <id column="model" property="model" />
+
+ <id column="luHao" property="luHao" />
+ <id column="packing" property="packing" />
+ <id column="proType" property="proType" />
+ <id column="color" property="color" />
+
</resultMap>
<select id="asrsAndErpList" resultMap="stockStatisDTO">
SELECT * FROM(
SELECT ROW_NUMBER ( ) OVER ( ORDER BY d.matnr ) AS row, * FROM (
SELECT * FROM asr_show_diff WHERE 1 = 1
- <if test="different != null and different ">
- and asrsQty = erpQty
+ <if test="different != null and different == 1 ">
+ and asrsQty != erpQty
</if>
- <if test="matnr != null">
- AND matnr like #{matnr}
+ <if test="different != null and different == 0 ">
+
</if>
- <if test="maktx != null">
- AND maktx like #{maktx}
+ <if test="matnr != null and matnr != ''">
+ AND matnr like '%' + #{matnr}+ '%'
</if>
- <if test="specs != null">
- AND specs like #{specs}
+ <if test="model != null and model != ''">
+ AND model like '%' + #{model}+ '%'
+ </if>
+ <if test="maktx != null and maktx != ''">
+ AND maktx like '%' + #{maktx}+ '%'
+ </if>
+ <if test="specs != null and specs != ''">
+ AND specs like '%' + #{specs}+ '%'
+ </if>
+ <if test="sPgNO != null and sPgNO != ''">
+ AND pgNO like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo != null and outOrderNo != ''">
+ AND outOrderNo like '%' + #{outOrderNo} + '%'
</if>
) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
+
<select id="asrsAndErpCount" resultType="java.lang.Long">
- SELECT count(*) FROM asr_show_diff WHERE 1 = 1 and asrsQty != erpQty
- <if test="matnr != null">
- AND matnr like #{matnr}
+ SELECT count(*) FROM asr_show_diff WHERE 1 = 1
+ <if test="different != null and different == 1 ">
+ and asrsQty != erpQty
</if>
- <if test="maktx != null">
- AND maktx like #{maktx}
+ <if test="different != null and different == 0 ">
+
</if>
- <if test="specs != null">
- AND specs like #{specs}
+ <if test="matnr != null and matnr != ''">
+ AND matnr like '%' + #{matnr}+ '%'
+ </if>
+ <if test="model != null and model != ''">
+ AND model like '%' + #{model}+ '%'
+ </if>
+ <if test="maktx != null and maktx != ''">
+ AND maktx like '%' + #{maktx}+ '%'
+ </if>
+ <if test="specs != null and specs != ''">
+ AND specs like '%' + #{specs}+ '%'
+ </if>
+ <if test="sPgNO != null and sPgNO != ''">
+ AND pgNO like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo != null and outOrderNo != ''">
+ AND outOrderNo like '%' + #{outOrderNo} + '%'
</if>
</select>
</mapper>
--
Gitblit v1.9.1