From bd789d6cafcccbba933dc9264adf46dab4a61ca0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 16:22:46 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/CustOrderMapper.xml | 2 +-
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 8 ++++++--
2 files changed, 7 insertions(+), 3 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..c95d61b 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 {
@@ -43,9 +44,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;
}
diff --git a/src/main/resources/mapper/CustOrderMapper.xml b/src/main/resources/mapper/CustOrderMapper.xml
index 6f5ba91..b561851 100644
--- a/src/main/resources/mapper/CustOrderMapper.xml
+++ b/src/main/resources/mapper/CustOrderMapper.xml
@@ -19,7 +19,7 @@
</resultMap>
- <update id="completeOrder">
+ <update id="updateStatus">
update man_cust_order set status = #{status} where 1=1 and number = #{number}
</update>
--
Gitblit v1.9.1