From 50f2f8945f1ab86c931fee6cf9d9bd88a122ae6e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 17:14:47 +0800
Subject: [PATCH] #单据出库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 7a00800..3c75226 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
@@ -28,6 +28,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
+import com.vincent.rsf.server.manager.enums.WaveRuleType;
/**
* @author Ryan
@@ -410,10 +411,10 @@
throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
}
List<OrderOutItemDto> locItems = null;
- switch (waveRule.getType()) {
- case 1:
- locItems = efficiencyFirst(param.getOrderId());
- break;
+ if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
+ locItems = efficiencyFirst(param.getOrderId());
+ } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
+
}
return R.ok(locItems);
}
@@ -421,7 +422,7 @@
private List<LocItem> getEfficiencyFirstItemList(AsnOrderItem asnOrderItem){
QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
locItemQueryWrapper.eq("matnr_code", asnOrderItem.getMatnrCode());
- locItemQueryWrapper.eq("batch", asnOrderItem.getBatch());
+ locItemQueryWrapper.eq("batch", asnOrderItem.getSplrBatch());
String applySql = String.format(
"EXISTS (SELECT 1 FROM man_loc ml " +
"WHERE ml.use_status = '%s'" +
@@ -431,9 +432,7 @@
);
locItemQueryWrapper.apply(applySql);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
- locItems.sort((s1,s2)->{
- return LocUtils.isShallowLoc(s1.getLocCode())?1:0;
- });
+ locItems.sort((s1,s2)-> LocUtils.isShallowLoc(s1.getLocCode())?-1:0);
return locItems;
}
--
Gitblit v1.9.1