自动化立体仓库 - WMS系统
zhang
2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5
src/main/java/com/zy/asrs/controller/OutController.java
@@ -77,7 +77,11 @@
        // 按包装组号分组处理
        Map<String, List<OrderDetl>> brandGroup = orderDetls.stream()
                .collect(Collectors.groupingBy(OrderDetl::getBrand));
                .collect(Collectors.groupingBy(o -> {
                    String brand = o.getBrand();
                    return brand != null ? brand : "跨巷道";
                }));
        List<LocDto> locDtos = new ArrayList<>();
@@ -221,11 +225,17 @@
                        .eq("model", paramLocDetl.getModel()));
                if (one != null) {
                    if (!"合格".equals(one.getThreeCode())) {
                        throw new CoolException(one.getModel() + "卷不合格: " + one.getThreeCode());
                    // 判断是否为盘点单(docType == 23),如果不是则校验合格性
                    Order order = orderService.selectByNo(stockOutParam.getOrderNo());
                    if ( order.getDocType() != 23) {
                        if (!"合格".equals(one.getThreeCode())) {
                            throw new CoolException(one.getModel() + "卷不合格: " + one.getThreeCode());
                        }
                    }
                    locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
                }
            }
            if (!locDetlDtos.isEmpty()) {