From 7eeac1431a999774a0bcf77c8cddf3032fdeaad8 Mon Sep 17 00:00:00 2001 From: zc <zc> Date: 星期二, 03 九月 2024 12:26:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs --- src/main/resources/mapper/LocDetlMapper.xml | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index dd8714e..0f80dc9 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -236,40 +236,45 @@ where 1=1 and b.loc_sts = 'F' -<!-- <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>--> <choose> - <when test="batch != null and batch != ''"> - and batch = #{batch} + <when test="sPgNO != null and sPgNO != ''"> + and a.pg_no = #{sPgNO} </when> <otherwise> - and (batch IS NULL OR batch = '') + and (sPgNO IS NULL OR sPgNO = '') </otherwise> </choose> -<!-- <if test="orderNo != null and orderNo != ''">--> -<!-- and a.order_no = #{orderNo}--> -<!-- </if>--> + <if test="batch != null and batch != ''"> + and a.batch = #{batch} + </if> +<!-- <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="model != null and model != ''"> and a.model = #{model} - and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0) + 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> -- Gitblit v1.9.1