From 129882afa114d612b125a8085bfd6e63dee82d54 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 14:20:00 +0800
Subject: [PATCH] 出库优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 77953ef..1381888 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -32,6 +32,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import com.vincent.rsf.server.manager.enums.WaveRuleType;
@@ -584,6 +585,10 @@
locItemQueryWrapper.apply(applySql);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
locItems.sort(Comparator.comparing((LocItem item) -> !LocUtils.isShallowLoc(item.getLocCode())));
+ List<LocItem> locsSet = locItems.stream().filter(locItem -> locItem.getAnfme().compareTo(asnOrderItem.getAnfme()) == 0.0).collect(Collectors.toList());
+ if (!locsSet.isEmpty()) {
+ return locsSet;
+ }
return locItems;
}
@@ -618,33 +623,13 @@
continue;
}
List<LocItem> locItems = new ArrayList<>();
- List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>()
- .eq(StringUtils.isNotBlank(asnOrderItem.getSplrBatch()), LocItem::getBatch, asnOrderItem.getSplrBatch())
- .eq(StringUtils.isNotBlank(asnOrderItem.getFieldsIndex()), LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
- .eq(StringUtils.isNotBlank(asnOrderItem.getPlatOrderCode()), LocItem::getPlatOrderCode, asnOrderItem.getPlatOrderCode())
- .eq(LocItem::getAnfme, asnOrderItem.getAnfme())
- .eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
- if (!items.isEmpty()) {
- for (LocItem item : items) {
- if (LocUtils.isShallowLoc(item.getLocCode())) {
- locItems.add(item);
- }
- }
- if (locItems.isEmpty()) {
- locItems.addAll(items);
- }
+ if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
+ locItems = getEfficiencyFirstItemList(asnOrderItem);
+ } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
+ locItems = getFirstInFirstOutItemList(asnOrderItem);
+ } else {
+ locItems = getFirstInFirstOutItemList(asnOrderItem);
}
-
- if (locItems.isEmpty()) {
- if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
- locItems = getEfficiencyFirstItemList(asnOrderItem);
- } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
- locItems = getFirstInFirstOutItemList(asnOrderItem);
- } else {
- locItems = getFirstInFirstOutItemList(asnOrderItem);
- }
- }
-
for (LocItem locItem : locItems) {
Loc loc = locService.getById(locItem.getLocId());
List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
--
Gitblit v1.9.1