预装单bug

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/utils/CustomMergeStrategy.java

@@ -156,7 +156,7 @@ public class CustomMergeStrategy extends AbstractMergeStrategy {
                 List<OrderWarehouseInBackVO> orderWarehouseInList1 = orderWarehouseInService.getOrderWarehouseInList(entry.getKey());
                 Map<Long, List<OrderWarehouseInBackItemDo>> collect = orderWarehouseInList1.stream().flatMap(item -> item.getOrderWarehouseInBackItemDoList().stream()).collect(Collectors.groupingBy(OrderWarehouseInBackItemDo::getId));
                 List<OrderWarehouseInDO> orderWarehouseInList = orderWarehouseInService.selectList(new QueryWrapper<OrderWarehouseInDO>()
-                        .select("id","order_item_id","in_time","unit","(select IFNULL(GROUP_CONCAT(concat(a.area_id,a.location_id)),'') from ecw_order_location a where a.warehouse_in_id=ecw_order_warehouse_in.id) as locationId ")
+                        .select("id","order_item_id","in_time","unit","(select IFNULL(GROUP_CONCAT(concat(a.area_id,a.location_id)),'') from ecw_order_location a where a.warehouse_in_id=ecw_order_warehouse_in.id and a.deleted=0) as locationId ")
                         .eq("order_id", entry.getKey()).in("order_item_id",orderItemIds));
                 orderWarehouseInList = orderWarehouseInList.stream().sorted(Comparator.comparing(OrderWarehouseInDO::getOrderItemId).thenComparing(OrderWarehouseInDO::getInTime).thenComparing(OrderWarehouseInDO::getUnit).thenComparing(OrderWarehouseInDO::getLocationId)).collect(Collectors.toList());
                 if (orderWarehouseInList != null && orderWarehouseInList.size() >=2) {