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/schedules/PakinSchedules.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java
index 6395da0..f176b6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
@@ -73,23 +74,43 @@
.distinct()
.collect(Collectors.toList());
- pkinItems.forEach(item -> {
- List<WkOrderItem> wkOrders = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, item));
- if (wkOrders.isEmpty()) {
+ pkinItems.forEach(asnCode -> {
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, asnCode));
+ if (orderItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛屽師鍗曟嵁涓嶅瓨鍦ㄦ垨宸蹭涪澶憋紒锛�");
}
- Set<Long> orderIds = wkOrders.stream().map(WkOrderItem::getOrderId).collect(Collectors.toSet());
- orderIds.forEach(itemId -> {
- WkOrder wkOrder = asnOrderService.getById(itemId);
+ Set<Long> orderIds = orderItems.stream().map(WkOrderItem::getOrderId).collect(Collectors.toSet());
+ // 璇ヨ鍗曚笅鎸夋槑缁嗘眹鎬荤殑宸茬粍鎵樻暟閲忥紙鎵�鏈夌粍鎵樻。涓� asnCode 瀵瑰簲鐨� anfme 鎸� asnItemId 姹囨�伙級
+ List<WaitPakinItem> allPakinItemsForOrder = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
+ .eq(WaitPakinItem::getAsnCode, asnCode));
+ Map<Long, Double> palletizedByItemId = allPakinItemsForOrder.stream()
+ .filter(p -> p.getAsnItemId() != null)
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId,
+ Collectors.summingDouble(p -> p.getAnfme() != null ? p.getAnfme() : 0.0)));
+
+ orderIds.forEach(orderId -> {
+ WkOrder wkOrder = asnOrderService.getById(orderId);
if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛屽師鍗曟嵁涓嶅瓨鍦ㄦ垨宸蹭涪澶憋紒锛�");
}
- if (wkOrder.getAnfme().compareTo(wkOrder.getQty()) == 0) {
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .eq(WkOrder::getId, itemId)
- .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderId));
+ if (items.isEmpty()) {
+ return;
+ }
+ // 浠呭綋鍏ㄩ儴鏄庣粏鍧囧凡缁勬墭瀹屾瘯涓斿凡鍏ュ簱瀹屾垚锛坬ty>=璁″垝锛夛紝鎵嶅皢鍏ュ簱鍗曠疆涓哄凡瀹屾垚
+ boolean allLinesDone = items.stream().allMatch(oi -> {
+ double plan = oi.getAnfme() != null ? oi.getAnfme() : 0.0;
+ if (QuantityUtils.compare(plan, 0.0) <= 0) {
+ return true;
}
+ double palletized = palletizedByItemId.getOrDefault(oi.getId(), 0.0);
+ double received = oi.getQty() != null ? oi.getQty() : 0.0;
+ return QuantityUtils.compare(palletized, plan) >= 0 && QuantityUtils.compare(received, plan) >= 0;
+ });
+ if (allLinesDone && !asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .eq(WkOrder::getId, orderId)
+ .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
}
});
--
Gitblit v1.9.1