logo修改 +入库完成校验

chen.lin

5 天以前 024504a3933e8f2f86e80383e61fa574524a0d28

 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;
@@ -13,8 +14,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@Component
@@ -66,25 +66,67 @@
            if (pakinItems.isEmpty()) {
                throw new CoolException("组拖明细为空！！");
            }
            List<String> pkinItems = pakinItems.stream().map(WaitPakinItem::getAsnCode).collect(Collectors.toList());
            pkinItems.forEach(item -> {
                List<WkOrderItem> wkOrders = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, item));
                if (wkOrders.isEmpty()) {
            // 过滤掉asnCode为null或空字符串的情况（无ASN单号的组托明细不需要处理单据状态）
            List<String> pkinItems = pakinItems.stream()
                    .map(WaitPakinItem::getAsnCode)
                    .filter(Objects::nonNull)
                    .filter(code -> !code.trim().isEmpty())
                    .distinct()
                    .collect(Collectors.toList());

            pkinItems.forEach(asnCode -> {
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, asnCode));
                if (orderItems.isEmpty()) {
                    throw new CoolException("数据错误，原单据不存在或已丢失！！");
                }
                Double sum = wkOrders.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnCode, item));
                if (waitPakinItems.isEmpty()) {
                    throw new CoolException("数据错误，组托明细不存在！！");
                }
                Double sum1 = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
                if (sum.compareTo(sum1) == 0) {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                            .eq(WkOrder::getCode, item)
                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("数据错误，原单据不存在或已丢失！！");
                    }
                    List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderId));
                    if (items.isEmpty()) {
                        return;
                    }
                    // 仅当全部明细均已组托完毕且已入库完成（qty>=计划），才将入库单置为已完成
                    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("单据修改失败！！");
                    }
                }
                });

//                Double sum = wkOrders.stream().mapToDouble(WkOrderItem::getAnfme).sum();
//                List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnCode, item));
//                if (waitPakinItems.isEmpty()) {
//                    throw new CoolException("数据错误，组托明细不存在！！");
//                }
//                Double sum1 = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
//                if (sum.compareTo(sum1) == 0) {
//                    if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
//                            .eq(WkOrder::getCode, item)
//                            .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
//                        throw new CoolException("单据修改失败！！");
//                    }
//                }
            });

            List<WaitPakinItemLog> itemLogs = new ArrayList<>();