From 9880fb9c0d0a1445d7288d8b0022065cccfff3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 10:06:19 +0800
Subject: [PATCH] Merge branch 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs
---
src/main/resources/mapper/LocDetlMapper.xml | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 129376a..aa3488a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -207,14 +207,28 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
+ and b.row1 >= 31
+ and b.row1 <= 32
+ group by b.bay1
+ union
+ select
+ no = 2,
+ orderBy = 'true',
+ b.bay1 as bay,
+ sum(anfme) as count
+ from asr_loc_detl a
+ 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}
and b.row1 >= 2
and b.row1 <= 17
group by b.bay1
union
select
- no = 2,
+ no = 3,
orderBy = 'false',
- b.bay1,
+ b.bay1 as bay,
sum(anfme) as count
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
@@ -225,7 +239,7 @@
and b.row1 <= 30
group by b.bay1
) a
- order by count desc
+ order by no, count desc
</select>
<select id="queryStock" resultMap="BaseResultMap">
@@ -235,10 +249,14 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
<if test="no!=null and no == 1">
+ and b.row1 >= 31
+ and b.row1 <= 32
+ </if>
+ <if test="no!=null and no == 2">
and b.row1 >= 2
and b.row1 <= 17
</if>
- <if test="no!=null and no == 2">
+ <if test="no!=null and no == 3">
and b.row1 >= 18
and b.row1 <= 30
</if>
@@ -246,7 +264,9 @@
and b.bay1 = #{bay}
and b.loc_sts = 'F'
order by b.row1
-
+ <if test="orderBy != null and orderBy != '' and orderBy == 'false'">
+ desc
+ </if>
</select>
<select id="queryStockAnfme" resultType="java.lang.Double">
--
Gitblit v1.9.1