From 55470b5fa4880dd7ac7838792cdf4ad4aaa7b0c3 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 03 九月 2024 12:33:26 +0800
Subject: [PATCH] 123
---
src/main/resources/mapper/LocDetlMapper.xml | 96 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 79d0924..24dbdd0 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,6 +44,20 @@
<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="auto_id" property="autoId" />
+ <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">
@@ -93,6 +107,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} + '%'
@@ -218,25 +235,46 @@
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="sPgNO != null and sPgNO != ''">
+ and a.pg_no = #{sPgNO}
+ </when>
+ <otherwise>
+ and (pg_no IS NULL OR pg_no = '')
+ </otherwise>
+ </choose>
+ <if test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </if>
<!-- <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="batch != null and batch != ''">
- and a.batch = #{batch}
- </if>
- <if test="orderNo != null and orderNo != ''">
- and a.order_no = #{orderNo}
+ <!-- <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="model != null and model != ''">
+ and a.model = #{model}
+ 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>
@@ -426,7 +464,7 @@
<id column="pgNo" property="pgNo" />
<id column="outOrderNo" property="outOrderNo" />
<id column="batch" property="batch" />
-
+ <id column="model" property="model" />
</resultMap>
<select id="asrsAndErpList" resultMap="stockStatisDTO">
@@ -441,6 +479,9 @@
</if>
<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}+ '%'
@@ -463,22 +504,25 @@
and asrsQty != erpQty
</if>
<if test="different != null and different == 0 ">
- and asrsQty = erpQty
+
</if>
- <if test="matnr != null">
- AND matnr like #{matnr}
+ <if test="matnr != null and matnr != ''">
+ AND matnr like '%' + #{matnr}+ '%'
</if>
- <if test="maktx != null">
- AND maktx like #{maktx}
+ <if test="model != null and model != ''">
+ AND model like '%' + #{model}+ '%'
</if>
- <if test="specs != null">
- AND specs like #{specs}
+ <if test="maktx != null and maktx != ''">
+ AND maktx like '%' + #{maktx}+ '%'
</if>
- <if test="sPgNO != null">
- AND pgNO like #{sPgNO}
+ <if test="specs != null and specs != ''">
+ AND specs like '%' + #{specs}+ '%'
</if>
- <if test="outOrderNo != null">
- AND outOrderNo like #{outOrderNo}
+ <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