diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsWarehouseBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsWarehouseBo.java index 081f3b3c..10b6edbe 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsWarehouseBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsWarehouseBo.java @@ -62,5 +62,10 @@ public class WmsWarehouseBo extends TreeEntity { */ private String remark; + /** + * 是否按使用次数排序(true=按useCount降序,false或不传=按sortNo升序) + */ + private Boolean orderByUseCount; + } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java index 674a3bd5..2d449d7a 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java @@ -104,5 +104,13 @@ List selectDeliveryExportListByCoilIds(@Param(" * @return 统计结果(Map包含totalGrossWeight, totalNetWeight) */ Map selectStatistics(@Param("ew") QueryWrapper qw); + + /** + * 统计仓库使用次数(按warehouse_id出现次数排序) + * + * @param warehouseIds 仓库ID列表 + * @return 每个仓库的钢卷数量 + */ + List> selectWarehouseIdCount(@Param("list") List warehouseIds); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsWarehouseServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsWarehouseServiceImpl.java index a3b4e7d4..f92b432f 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsWarehouseServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsWarehouseServiceImpl.java @@ -56,8 +56,12 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService { lqw.eq(bo.getSortNo() != null, WmsWarehouse::getSortNo, bo.getSortNo()); lqw.eq(bo.getUseCount() != null, WmsWarehouse::getUseCount, bo.getUseCount()); lqw.eq(bo.getIsEnabled() != null, WmsWarehouse::getIsEnabled, bo.getIsEnabled()); - // 新增排序(SortNo升序) - lqw.orderByAsc(WmsWarehouse::getSortNo); + // 排序逻辑:orderByUseCount为true时按useCount降序,否则按sortNo升序 + if (Boolean.TRUE.equals(bo.getOrderByUseCount())) { + lqw.orderByDesc(WmsWarehouse::getUseCount).orderByAsc(WmsWarehouse::getSortNo); + } else { + lqw.orderByAsc(WmsWarehouse::getSortNo); + } return lqw; } diff --git a/klp-wms/src/main/java/com/klp/task/WarehouseUseCountTask.java b/klp-wms/src/main/java/com/klp/task/WarehouseUseCountTask.java new file mode 100644 index 00000000..5c11ba95 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/task/WarehouseUseCountTask.java @@ -0,0 +1,61 @@ +package com.klp.task; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.klp.domain.WmsWarehouse; +import com.klp.mapper.WmsMaterialCoilMapper; +import com.klp.mapper.WmsWarehouseMapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Slf4j +@RequiredArgsConstructor +@Component +public class WarehouseUseCountTask { + + private final WmsMaterialCoilMapper materialCoilMapper; + private final WmsWarehouseMapper warehouseMapper; + + @Scheduled(cron = "0 0 1 * * ?") + @Transactional(rollbackFor = Exception.class) + public void calculateWarehouseUseCount() { + log.info("[仓库使用次数定时任务] 开始计算仓库使用次数"); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(WmsWarehouse::getWarehouseId); + List warehouses = warehouseMapper.selectList(wrapper); + + if (warehouses.isEmpty()) { + log.info("[仓库使用次数定时任务] 未找到仓库记录"); + return; + } + + List warehouseIds = warehouses.stream() + .map(WmsWarehouse::getWarehouseId) + .collect(Collectors.toList()); + + List> countList = materialCoilMapper.selectWarehouseIdCount(warehouseIds); + + Map countMap = new HashMap<>(); + for (Map item : countList) { + Long wid = ((Number) item.get("warehouse_id")).longValue(); + Long count = ((Number) item.get("coil_count")).longValue(); + countMap.put(wid, count); + } + + for (WmsWarehouse warehouse : warehouses) { + Long count = countMap.getOrDefault(warehouse.getWarehouseId(), 0L); + warehouse.setUseCount(count.intValue()); + warehouseMapper.updateById(warehouse); + } + + log.info("[仓库使用次数定时任务] 完成,共更新 {} 个仓库", warehouses.size()); + } +} \ No newline at end of file diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index e2d9292d..17feea6f 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -924,5 +924,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${ew.customSqlSegment} + + +