From 2f150bb974c99666228a9f443e84241c238db3e0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 九月 2023 16:37:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +-
src/main/java/com/zy/asrs/controller/LocDetlController.java | 10 +++++++++-
src/main/resources/mapper/LocDetlMapper.xml | 10 +++++++++-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4 ++--
5 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index c5fab80..81f7717 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -112,11 +112,19 @@
// }
excludeTrash(param);
String locNo = convert(param, wrapper);
+ String zpallet = String.valueOf( param.get("zpallet"));
+ String matnr = String.valueOf( param.get("matnr"));
+ if (!Cools.isEmpty(zpallet) && zpallet.equals("null")) {
+ zpallet = null;
+ }
+ if (!Cools.isEmpty(matnr) && matnr.equals("null")) {
+ matnr = null;
+ }
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){
- List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo);
+ List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo,zpallet,matnr);
return R.ok(locDetlPage.setRecords(locDetls));
}else {
return R.ok(locDetlPage);
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index d73f4fc..1e99588 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -66,7 +66,7 @@
List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("owner")int owner);
- List<LocDetl> queryStockViewMerge(@Param("locNo")String locNo);
+ List<LocDetl> queryStockViewMerge(@Param("locNo") String locNo,@Param("zpallet") String zpallet,@Param("matnr") String matnr);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 18dd497..3df0571 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -34,7 +34,7 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
- List<LocDetl> queryStockViewMerge(String locNo);
+ List<LocDetl> queryStockViewMerge(String locNo,String zpallet,String matnr);
Page<LocDetl> getStockStatis(Page<LocDetl> page);
Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
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 0183f3d..033b467 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -117,8 +117,8 @@
}
@Override
- public List<LocDetl> queryStockViewMerge(String locNo) {
- return this.baseMapper.queryStockViewMerge(locNo);
+ public List<LocDetl> queryStockViewMerge(String locNo,String zpallet,String matnr) {
+ return this.baseMapper.queryStockViewMerge(locNo,zpallet,matnr);
}
@Override
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 8467abc..0d0e3b5 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -386,7 +386,15 @@
from asr_loc_detl_merge a
left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
where 1=1
- and a.loc_no = #{locNo}
+ <if test="locNo != null and locNo !=''">
+ and a.loc_no = #{locNo}
+ </if>
+ <if test="zpallet != null and zpallet !=''">
+ and a.zpallet = #{zpallet}
+ </if>
+ <if test="matnr != null and matnr !='' and matnr !='null'">
+ and a.matnr = #{matnr}
+ </if>
</select>
<select id="queryStockViewMergeCount" resultType="java.lang.Integer">
select count(1) from asr_loc_mast_man_node_merge
--
Gitblit v1.9.1