From 3cd7db41473da40a73a0812797f9bf5834e56bc6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 15:05:14 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 71ec652..849a6fd 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;
@@ -184,7 +185,7 @@
AsnOrder order = new AsnOrder();
BeanUtils.copyProperties(delivery, order);
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
- if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌� 銆孲YS_OUT_STOCK_CODE銆嶇紪鐮佹槸鍚﹁缃垚鍔�");
}
order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
@@ -583,9 +584,11 @@
);
locItemQueryWrapper.apply(applySql);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
- locItems.sort(Comparator
- .comparing((LocItem item) -> !LocUtils.isShallowLoc(item.getLocCode()))
- );
+ 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;
}
@@ -619,7 +622,7 @@
if (issued.doubleValue() <= 0) {
continue;
}
- List<LocItem> locItems = null;
+ List<LocItem> locItems = new ArrayList<>();
if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
locItems = getEfficiencyFirstItemList(asnOrderItem);
} else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
@@ -661,8 +664,6 @@
issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
}
- } else {
-
}
}
if (issued.doubleValue() > 0) {
--
Gitblit v1.9.1