From fde7a28aae0a134821d6eb5ebaa5e6319cb73139 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:44:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/resources/mapper/LocDetlMapper.xml | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 24dbdd0..83e08fa 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -245,18 +245,14 @@
<!-- </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>-->
+
+ <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>-->
@@ -267,8 +263,8 @@
<!-- <if test="orderNo != null and orderNo != ''">-->
<!-- and a.order_no = #{orderNo}-->
<!-- </if>-->
- <if test="model != null and model != ''">
- and a.model = #{model}
+ <if test="matnr != null and matnr != ''">
+ and a.matnr = #{matnr}
and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
</if>
--
Gitblit v1.9.1