Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

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<>();