From aa21112291b04d0d3d53d75104a348f019f935a1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 09:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 7bdc702..f5205c9 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -41,12 +41,14 @@
}
@Override
- public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
- List<LocDetl> allLocDetlData = baseMapper.getAllLocDetlData(loc_no, matnr);
- for (int i = 0; i < allLocDetlData.size(); i++) {
- allLocDetlData.get(i).setMatStatusFlag(matStatusFlag);
- }
- baseMapper.updateMatStatus(allLocDetlData);
- return baseMapper.getAllLocDetlData(loc_no, matnr);
+ public Integer getAllLocDetlData(List<LocDetl> list) {
+ return baseMapper.updateMatStatus(list);
+ }
+
+ @Override
+ public Page<LocDetl> queryAllMatDetl(Page<LocDetl> page) {
+ page.setRecords(baseMapper.queryAllMatDetl(page.getCondition()));
+ page.setTotal(baseMapper.queryAllMatDetlPageCount(page.getCondition()));
+ return page;
}
}
--
Gitblit v1.9.1