From 024504a3933e8f2f86e80383e61fa574524a0d28 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 16:39:52 +0800
Subject: [PATCH] logo修改 +入库完成校验
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 cc79c6d..deec95f 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
@@ -755,16 +755,11 @@
.findFirst()
.orElse(null);
- // 涓ユ牸鍖归厤鏈壘鍒版椂锛氬啀鎸夈�屽悓鍗曞彿+鍚岀墿鏂欍�嶅鏉惧尮閰嶏紝閬垮厤鍘熸槑缁� fields_index 涓虹┖鑰屽垎閰嶅甫绁ㄥ彿瀵艰嚧閲嶅鍒涘缓涓�鏉�
+ // 涓ユ牸鍖归厤鏈壘鍒版椂锛氭寜銆屽悓鍗曞彿+鍚岀墿鏂�+鏈夊墿浣欍�嶅尮閰嶏紝涓嶆寜鎵规锛岄伩鍏嶅嚭搴撲笉妫�鏌ユ壒娆℃椂閫夊埌涓嶅悓鎵规搴撲綅鍗磋嚜鍔ㄦ柊澧炰竴鏉″嚭搴撳崟鏄庣粏
if (Objects.isNull(orderItem)) {
LambdaQueryWrapper<WkOrderItem> relaxedWrapper = new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, outId)
.eq(WkOrderItem::getMatnrId, locItem.getMatnrId());
- if (StringUtils.isNotBlank(locItem.getSplrBatch())) {
- relaxedWrapper.eq(WkOrderItem::getSplrBatch, locItem.getSplrBatch());
- } else if (StringUtils.isNotBlank(locItem.getBatch())) {
- relaxedWrapper.and(w -> w.eq(WkOrderItem::getBatch, locItem.getBatch()).or().eq(WkOrderItem::getSplrBatch, locItem.getBatch()));
- }
orderItem = outStockItemService.list(relaxedWrapper).stream()
.filter(o -> o.getAnfme() != null && o.getWorkQty() != null && o.getAnfme().compareTo(o.getWorkQty()) > 0)
.findFirst()
@@ -943,13 +938,14 @@
if (issued.compareTo(ISSUED_TOLERANCE) <= 0) {
continue;
}
+ // 鍑哄簱鍒嗛厤涓嶆寜鎵规杩囨护锛屼粎鎸夌墿鏂欑紪鐮佹煡搴撲綅锛屼究浜庢甯告娴嬪埌鍙嚭搴撳簱瀛�
List<LocItem> locItems = new ArrayList<>();
if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
- locItems = LocManageUtil.getEfficiencyFirstItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
+ locItems = LocManageUtil.getEfficiencyFirstItemList(wkOrderItem.getMatnrCode(), null, wkOrderItem.getAnfme());
} else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
- locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
+ locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), null, wkOrderItem.getAnfme());
} else {
- locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
+ locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), null, wkOrderItem.getAnfme());
}
for (LocItem locItem : locItems) {
Loc loc = locService.getById(locItem.getLocId());
--
Gitblit v1.9.1