From d559780d63e92b9cbbdf82b819cbc8bc9053da80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 08:18:59 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 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..1e673f3 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
@@ -10,13 +10,16 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.manager.entity.Prior;
import zy.cloud.wms.manager.mapper.LocDetlMapper;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.service.PriorService;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -25,10 +28,14 @@
private CustOrderService custOrderService;
@Autowired
private MatService matService;
+ @Autowired
+ private PriorService priorService;
@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 +50,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 +88,20 @@
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;
+ }
+
+ @Override
+ public Boolean isPrior(Long nodeId, String matnr) {
+ return priorService.selectCount(new EntityWrapper<Prior>().eq("matnr", matnr).eq("node_id", nodeId).eq("status", 1))>0;
+ }
+
}
--
Gitblit v1.9.1