From ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 08:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
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 6247c31..89da6aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -29,7 +29,16 @@
if (anfme <= 0) {
return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
} else {
- return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch, null, null) > 0;
+ }
+ }
+
+ @Override
+ public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String manu, String memo) {
+ if (anfme <= 0) {
+ return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
+ } else {
+ return baseMapper.updateAnfme(anfme, locNo, matnr, batch, manu, memo) > 0;
}
}
@@ -39,8 +48,8 @@
}
@Override
- public List<String> getSameDetl(String matnr, Integer start, Integer end) {
- return this.baseMapper.selectSameDetl(matnr, start, end);
+ public List<String> getSameDetl(String matnr) {
+ return this.baseMapper.selectSameDetl(matnr);
}
@Override
@@ -52,6 +61,12 @@
@Override
public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ return page;
+ }
+ @Override
+ public Page<LocDetl> getStockStatis2(Page<LocDetl> page) {
+ page.setRecords(baseMapper.getStockStatis2(page.getCondition()));
page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
return page;
}
@@ -79,9 +94,9 @@
@Override
public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
List<LocDetl> result = new ArrayList<>();
- List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
+ List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr, batch);
for (QueryStockPreDo preDo : preDos) {
- List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getBay());
+ List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, batch, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
result.addAll(locDetls);
}
return result;
@@ -133,6 +148,11 @@
return this.baseMapper.selectGroupPage(param);
}
+ @Override
+ public List<LocDetl> selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
+
@Override
public LocDetl selectItem(String locNo, String matnr, String batch) {
--
Gitblit v1.9.1