From 8a42df9f13c1328b36ba5919258b2636dce455fe Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 24 六月 2025 16:25:48 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 45 ++++-----------------------------------------
1 files changed, 4 insertions(+), 41 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 7068b65..62c4b3e 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
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -567,44 +568,6 @@
}
- private List<LocItem> getEfficiencyFirstItemList(AsnOrderItem asnOrderItem) {
- LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
- locItemQueryWrapper.eq(LocItem::getMatnrCode, asnOrderItem.getMatnrCode());
- locItemQueryWrapper.eq(LocItem::getBatch, asnOrderItem.getSplrBatch());
- String applySql = String.format(
- "EXISTS (SELECT 1 FROM man_loc ml " +
- "WHERE ml.use_status = '%s'" +
- "AND ml.id = man_loc_item.loc_id " +
- ")",
- LocStsType.LOC_STS_TYPE_F.type
- );
- 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;
- }
-
- private List<LocItem> getFirstInFirstOutItemList(AsnOrderItem asnOrderItem) {
- LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
- locItemQueryWrapper.eq(LocItem::getMatnrCode, asnOrderItem.getMatnrCode());
- locItemQueryWrapper.eq(LocItem::getBatch, asnOrderItem.getSplrBatch());
- locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
- String applySql = String.format(
- "EXISTS (SELECT 1 FROM man_loc ml " +
- "WHERE ml.use_status = '%s'" +
- "AND ml.id = man_loc_item.loc_id " +
- ")",
- LocStsType.LOC_STS_TYPE_F.type
- );
- locItemQueryWrapper.apply(applySql);
- List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
- return locItems;
- }
-
private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule) {
List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, orderId));
@@ -620,11 +583,11 @@
}
List<LocItem> locItems = new ArrayList<>();
if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
- locItems = getEfficiencyFirstItemList(asnOrderItem);
+ locItems = LocManageUtil.getEfficiencyFirstItemList(asnOrderItem.getMatnrCode(), asnOrderItem.getSplrBatch(), asnOrderItem.getAnfme());
} else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
- locItems = getFirstInFirstOutItemList(asnOrderItem);
+ locItems = LocManageUtil.getFirstInFirstOutItemList(asnOrderItem.getMatnrCode(), asnOrderItem.getSplrBatch(), asnOrderItem.getAnfme());
} else {
- locItems = getFirstInFirstOutItemList(asnOrderItem);
+ locItems = LocManageUtil.getFirstInFirstOutItemList(asnOrderItem.getMatnrCode(), asnOrderItem.getSplrBatch(), asnOrderItem.getAnfme());
}
for (LocItem locItem : locItems) {
Loc loc = locService.getById(locItem.getLocId());
--
Gitblit v1.9.1