From 88ed8d1da9f9d19d2b83a88bbf0d08f74540c38e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 03 十一月 2022 14:00:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 5 ++++-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 2 +-
src/main/java/com/zy/common/model/QueryStockPreDo.java | 2 ++
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a0e6b4a..ce03a9e 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -54,7 +54,7 @@
List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr);
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("bay") Integer bay);
+ List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("orderBy") String orderBy, @Param("bay") Integer bay);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 213eaad..688e2a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -80,7 +80,7 @@
List<LocDetl> result = new ArrayList<>();
List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
for (QueryStockPreDo preDo : preDos) {
- List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getBay());
+ List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
result.addAll(locDetls);
}
return result;
diff --git a/src/main/java/com/zy/common/model/QueryStockPreDo.java b/src/main/java/com/zy/common/model/QueryStockPreDo.java
index f959804..28df782 100644
--- a/src/main/java/com/zy/common/model/QueryStockPreDo.java
+++ b/src/main/java/com/zy/common/model/QueryStockPreDo.java
@@ -14,4 +14,6 @@
private Double count;
+ private String orderBy;
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 7571504..129376a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -199,6 +199,7 @@
(
select
no = 1,
+ orderBy = 'true',
b.bay1 as bay,
sum(anfme) as count
from asr_loc_detl a
@@ -212,6 +213,7 @@
union
select
no = 2,
+ orderBy = 'false',
b.bay1,
sum(anfme) as count
from asr_loc_detl a
@@ -243,7 +245,8 @@
and a.matnr = #{matnr}
and b.bay1 = #{bay}
and b.loc_sts = 'F'
- order by b.row1 asc
+ order by b.row1
+
</select>
<select id="queryStockAnfme" resultType="java.lang.Double">
--
Gitblit v1.9.1