From 2d28053beec1de1e98b442b6af3734cea7fd0949 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 三月 2021 17:02:46 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
index d80fcf3..3cb3441 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -27,8 +28,10 @@
private MatService matService;
@Override
- public Page<LocDetl> getPage(Page page, String nodeId, Object locNo, Object matnr, Object maktx) {
- return page.setRecords(baseMapper.listByPage(page, nodeId, locNo, matnr, maktx));
+ public Page<LocDetl> getPage(Page<LocDetl> page) {
+ page.setRecords(baseMapper.listByPage(page.getCondition()));
+ page.setTotal(baseMapper.listByPageCount(page.getCondition()));
+ return page;
}
@Override
@@ -43,9 +46,12 @@
if (!Cools.isEmpty(locDetls)) {
result.addAll(locDetls);
}
+ List<Long> nodeIds = locDetls.stream().map(LocDetl::getNodeId).distinct().collect(Collectors.toList());
List<LocDetl> locDetls1 = this.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr).eq("status", 1).orderBy("create_time"));
- if (!Cools.isEmpty(locDetls1)) {
- result.addAll(locDetls1);
+ for (LocDetl locDetl : locDetls1) {
+ if (!nodeIds.contains(locDetl.getNodeId())) {
+ result.add(locDetl);
+ }
}
return result;
}
@@ -78,5 +84,16 @@
return this.baseMapper.reduceStock(nodeId, matnr, anfme)>0;
}
+ @Override
+ public Boolean incrementStock(Long nodeId, String matnr, Double anfme) {
+ return this.baseMapper.incrementStock(nodeId, matnr, anfme)>0;
+ }
+
+ @Override
+ public Boolean removeStock(Long nodeId, String matnr) {
+ return this.baseMapper.removeStock(nodeId, matnr)>0;
+ }
+
+
}
--
Gitblit v1.9.1