代码恢复到与其他分支一致

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -2298,11 +2298,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
         List<Long> orderIdList2 = guanlianList.stream().map(OrderGuanlianDO::getRelateOrderId).collect(Collectors.toList());
         // 合并
         orderIdList1.addAll(orderIdList2);
-        // 去除orderId
-        orderIdList1.remove(orderId);
         // 去重
         orderIdList1 = orderIdList1.stream().distinct().collect(Collectors.toList());
 
+        // 去除orderId
+        orderIdList1.remove(orderId);
+
         // 根据orderIdLists查询关联订单
         List<BoxPreloadGoodsBackVO> goodsItemList = boxPreloadGoodsService.getGuanLianGoodItemList(orderIdList1);
 
@@ -2760,6 +2761,40 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
     public BoxCabinetLoadVO getBoxCabinetDetail(Long shipmentId) {
         List<BoxLoadSectionBackVO> boxLoadDetailBackVO = boxPreloadGoodsService.loadSecGoodsList(shipmentId);
 
+        /*查询所有库区库域信息 20250116 影响性能屏蔽
+        List<WarehouseAreaDO> areaList = warehouseAreaService.list(new LambdaQueryWrapper<>());
+        List<WarehouseAreaPositionDO> positionList = warehouseAreaPositionService.list(new LambdaQueryWrapper<>());
+        for (BoxLoadSectionBackVO sectionBackVO : boxLoadDetailBackVO) {
+            List<BoxLoadOrderVO> orderList = sectionBackVO.getSectionOrderList();
+            if (CollectionUtil.isEmpty(orderList)) continue;
+            for (BoxLoadOrderVO orderVO : orderList) {
+                Long orderId = orderVO.getOrderId();
+                List<OrderLocationDO> orderLocationLists = orderLocationService.getOrderLocationListByOrderId(orderId);
+
+                //按照订单纬度返回信息，分组
+                Map<String, List<OrderLocationDO>> positionMap = orderLocationLists.stream()
+                        .collect(Collectors.groupingBy(
+                                t -> t.getOrderId() + "_" +
+//                                        t.getOrderItemId() + "_" +
+                                        t.getWareId() + "_" + t.getAreaId() + "_" + t.getLocationId()));
+                List<OrderLocationDO> locationList = new ArrayList<>();
+                for (Map.Entry<String, List<OrderLocationDO>> entry : positionMap.entrySet()) {
+                    List<OrderLocationDO> orderLocationDOList = entry.getValue();
+                    locationList.add(orderLocationDOList.get(0));
+                }
+
+                String positionNo = matchLocation(areaList, positionList, locationList);
+                orderVO.setPositionNo(positionNo);
+                orderVO.setOrderLocationList(OrderLocationConvert.INSTANCE.convertList(locationList));
+
+                List<BoxPreloadGoodsBackVO> orderGoodsItemList = orderVO.getGoodsList();
+                for (BoxPreloadGoodsBackVO itemVO : orderGoodsItemList) {
+                    matchItemLocation(areaList, positionList, locationList, itemVO);
+                }
+            }
+        }
+         */
+
         BoxCabinetLoadVO boxCabinetLoadVO = new BoxCabinetLoadVO();
         boxCabinetLoadVO.setLoadDetail(boxLoadDetailBackVO);