From 73de789fbbc67873aab0e72eb0f469ea195c1cbe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:15 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/resources/mapper/LocDetlMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 8e6b7de..b12be7f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -64,6 +64,7 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
+ and (batch IS NULL OR batch = '')
<choose>
<when test="suppCode != null and suppCode != ''">
and supp_code = #{suppCode}
@@ -180,9 +181,12 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ , a.maktx
+ , a.specs
+ , model
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr,a.maktx,a.specs,model
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
--
Gitblit v1.9.1