Merge branch 'master-fix' into release

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/WarehouseAreaPositionService.java

@@ -68,4 +68,5 @@ public interface WarehouseAreaPositionService extends IService<WarehouseAreaPosi
     List<WarehouseAreaPositionDO> getByParentIds(Collection<Long> ids);
 
     List<WarehouseAreaPositionDO> getByDomainIdList(List<Long> idList);
+    List<WarehouseAreaPositionDO> getAll();
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/WarehouseAreaService.java

@@ -70,6 +70,7 @@ public interface WarehouseAreaService extends IService<WarehouseAreaDO> {
     List<WarehouseAreaDO> getWarehouseAreaList(WarehouseAreaQueryVO query);
 
     List<WarehouseAreaBackVO> getWarehouseAreaListV1(WarehouseAreaQueryVO query);
+    List<WarehouseAreaDO> getAll();
 
     PageResult<WarehouseAreaBackVO> getWarehouseAreaPageV1(WarehouseAreaQueryVO query, PageVO page);
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseAreaPositionServiceImpl.java

@@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.depository.convert.warehouse.WarehouseAreaPositio
 import cn.iocoder.yudao.module.depository.dal.dataobject.warehouse.WarehouseAreaPositionDO;
 import cn.iocoder.yudao.module.depository.dal.mysql.warehouse.WarehouseAreaPositionMapper;
 import cn.iocoder.yudao.module.depository.service.warehouse.WarehouseAreaPositionService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
@@ -32,6 +34,7 @@ public class WarehouseAreaPositionServiceImpl extends AbstractService<WarehouseA
     private WarehouseAreaPositionMapper warehouseAreaPositionMapper;
 
     @Override
+    @CacheEvict(cacheNames = "jd:warehouse:area:position", key = "'all'")
     public Long createWarehouseAreaPosition(WarehouseAreaPositionCreateReqVO createReqVO) {
         // 插入
         WarehouseAreaPositionDO warehouseAreaPosition = WarehouseAreaPositionConvert.INSTANCE.convert(createReqVO);
@@ -41,6 +44,7 @@ public class WarehouseAreaPositionServiceImpl extends AbstractService<WarehouseA
     }
 
     @Override
+    @CacheEvict(cacheNames = "jd:warehouse:area:position", key = "'all'")
     public void updateWarehouseAreaPosition(WarehouseAreaPositionUpdateReqVO updateReqVO) {
         // 校验存在
         this.validateWarehouseAreaPositionExists(updateReqVO.getId());
@@ -50,6 +54,7 @@ public class WarehouseAreaPositionServiceImpl extends AbstractService<WarehouseA
     }
 
     @Override
+    @CacheEvict(cacheNames = "jd:warehouse:area:position", key = "'all'")
     public void deleteWarehouseAreaPosition(Long id) {
         // 校验存在
         this.validateWarehouseAreaPositionExists(id);
@@ -96,4 +101,10 @@ public class WarehouseAreaPositionServiceImpl extends AbstractService<WarehouseA
             .in(WarehouseAreaPositionDO::getDomainId, idList)
         );
     }
+
+    @Override
+    @Cacheable(cacheNames = "jd:warehouse:area:position", key = "'all'")
+    public List<WarehouseAreaPositionDO> getAll() {
+        return warehouseAreaPositionMapper.selectList();
+    }
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseAreaServiceImpl.java

@@ -18,6 +18,8 @@ import cn.iocoder.yudao.module.depository.dal.dataobject.warehouse.WarehouseArea
 import cn.iocoder.yudao.module.depository.dal.mysql.warehouse.WarehouseAreaMapper;
 import cn.iocoder.yudao.module.depository.service.warehouse.WarehouseAreaService;
 import cn.iocoder.yudao.module.depository.vo.warehouseAreaPosition.WarehouseAreaPositionBackVO;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
@@ -42,6 +44,7 @@ public class WarehouseAreaServiceImpl extends AbstractService<WarehouseAreaMappe
     private WarehouseAreaPositionService warehouseAreaPositionService;
 
     @Override
+    @CacheEvict(cacheNames = "jd:warehouse:area", key = "'all'")
     public Long createWarehouseArea(WarehouseAreaCreateReqVO createReqVO) {
         // 插入
         WarehouseAreaDO warehouseArea = WarehouseAreaConvert.INSTANCE.convert(createReqVO);
@@ -51,6 +54,7 @@ public class WarehouseAreaServiceImpl extends AbstractService<WarehouseAreaMappe
     }
 
     @Override
+    @CacheEvict(cacheNames = "jd:warehouse:area", key = "'all'")
     public void updateWarehouseArea(WarehouseAreaUpdateReqVO updateReqVO) {
         // 校验存在
         this.validateWarehouseAreaExists(updateReqVO.getId());
@@ -60,6 +64,7 @@ public class WarehouseAreaServiceImpl extends AbstractService<WarehouseAreaMappe
     }
 
     @Override
+    @CacheEvict(cacheNames = "jd:warehouse:area", key = "'all'")
     public void deleteWarehouseArea(Long id) {
         // 校验存在
         this.validateWarehouseAreaExists(id);
@@ -109,6 +114,12 @@ public class WarehouseAreaServiceImpl extends AbstractService<WarehouseAreaMappe
         return dataList;
     }
 
+    @Override
+    @Cacheable(cacheNames = "jd:warehouse:area", key = "'all'")
+    public List<WarehouseAreaDO> getAll() {
+        return warehouseAreaMapper.selectList();
+    }
+
     @Override
     public PageResult<WarehouseAreaBackVO> getWarehouseAreaPageV1(WarehouseAreaQueryVO query, PageVO page) {
         PageResult<WarehouseAreaDO> pageResult = warehouseAreaMapper.selectPage(page, query);

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderLocation/OrderLocationMapper.java

@@ -60,7 +60,7 @@ public interface OrderLocationMapper extends AbstractMapper<OrderLocationDO> {
             "left join ecw_warehouse_area ware on loc.ware_id = ware.id " +
             "left join ecw_warehouse_area area on loc.area_id = area.id " +
             "left join ecw_warehouse_area_position posi on loc.location_id = posi.id " +
-            "where order_id = #{orderId} and loc.deleted=0")
+            "where loc.order_id = #{orderId} and loc.deleted=0")
     List<OrderLocationDO> selectListWithName(@Param("orderId") Long orderId);
 
 

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

@@ -2839,16 +2839,16 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
     public BoxCabinetLoadVO getBoxCabinetDetailV2(Long shipmentId) {
         List<BoxLoadSectionBackVO> boxLoadDetailBackVO = boxPreloadGoodsService.loadSecGoodsListV2(shipmentId);
 
-        /*查询所有库区库域信息 20250116 影响性能屏蔽
-        List<WarehouseAreaDO> areaList = warehouseAreaService.list(new LambdaQueryWrapper<>());
-        List<WarehouseAreaPositionDO> positionList = warehouseAreaPositionService.list(new LambdaQueryWrapper<>());
+        // 查询所有库区库域信息 20250116 影响性能屏蔽
+        // TODO 这里需要展示库位,不能注释
+        List<WarehouseAreaDO> areaList = warehouseAreaService.getAll();
+        List<WarehouseAreaPositionDO> positionList = warehouseAreaPositionService.getAll();
         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(
@@ -2871,7 +2871,6 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                 }
             }
         }
-         */
 
         BoxCabinetLoadVO boxCabinetLoadVO = new BoxCabinetLoadVO();
         boxCabinetLoadVO.setLoadDetail(boxLoadDetailBackVO);