feat(wms): 新增物流管理和快递问题模块
- 添加物流预览、快递问题相关API - 实现物流剩余时间、物流状态编辑组件 - 开发设计项目汇报详情页面,包括货物类别自动补全、图片预览等功能- 新增物流类型枚举
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.klp.domain.WmsStock;
|
||||
import com.klp.domain.WmsStockLog;
|
||||
import com.klp.domain.vo.WmsStockLogVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.klp.domain.WmsWarehouse;
|
||||
import com.klp.mapper.WmsWarehouseMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsStockLogBo;
|
||||
@@ -16,6 +18,8 @@ import com.klp.domain.WmsStockLog;
|
||||
import com.klp.mapper.WmsStockLogMapper;
|
||||
import com.klp.service.IWmsStockLogService;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
@@ -31,6 +35,8 @@ import java.util.Collection;
|
||||
public class WmsStockLogServiceImpl implements IWmsStockLogService {
|
||||
|
||||
private final WmsStockLogMapper baseMapper;
|
||||
@Resource
|
||||
private WmsWarehouseMapper warehouseMapper;
|
||||
|
||||
/**
|
||||
* 查询库存流水
|
||||
@@ -62,7 +68,15 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService {
|
||||
private QueryWrapper<WmsStockLog> buildQueryWrapperPlus(WmsStockLogBo bo) {
|
||||
QueryWrapper<WmsStockLog> lqw = Wrappers.query();
|
||||
lqw.eq("sl.del_flag", 0);
|
||||
lqw.eq(bo.getWarehouseId() != null, "sl.warehouse_id", bo.getWarehouseId());
|
||||
// 处理仓库ID查询,支持递归查询子节点
|
||||
if (bo.getWarehouseId() != null) {
|
||||
List<Long> warehouseIds = getWarehouseIdsWithChildren(bo.getWarehouseId());
|
||||
if (warehouseIds.size() == 1) {
|
||||
lqw.eq("sl.warehouse_id", warehouseIds.get(0));
|
||||
} else {
|
||||
lqw.in("sl.warehouse_id", warehouseIds);
|
||||
}
|
||||
}
|
||||
lqw.eq(bo.getItemId() != null, "sl.item_id", bo.getItemId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getItemType()), "sl.item_type", bo.getItemType());
|
||||
lqw.eq(bo.getChangeQty() != null, "sl.change_qty", bo.getChangeQty());
|
||||
@@ -83,8 +97,6 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService {
|
||||
lqw.eq(bo.getChangeQty() != null, WmsStockLog::getChangeQty, bo.getChangeQty());
|
||||
lqw.eq(bo.getAfterQty() != null, WmsStockLog::getAfterQty, bo.getAfterQty());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), WmsStockLog::getChangeType, bo.getChangeType());
|
||||
// lqw.eq(bo.getChangeTime() != null, WmsStockLog::getChangeTime, bo.getChangeTime());
|
||||
|
||||
// 根据时间区间查询
|
||||
lqw.ge(bo.getStartTime() != null, WmsStockLog::getChangeTime, bo.getStartTime());
|
||||
lqw.le(bo.getEndTime() != null, WmsStockLog::getChangeTime, bo.getEndTime());
|
||||
@@ -132,4 +144,38 @@ public class WmsStockLogServiceImpl implements IWmsStockLogService {
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定仓库ID及其所有子仓库ID
|
||||
* @param warehouseId 仓库ID
|
||||
* @return 包含当前仓库ID和所有子仓库ID的列表
|
||||
*/
|
||||
private List<Long> getWarehouseIdsWithChildren(Long warehouseId) {
|
||||
List<Long> warehouseIds = new ArrayList<>();
|
||||
warehouseIds.add(warehouseId); // 添加当前仓库ID
|
||||
|
||||
// 递归获取所有子仓库ID
|
||||
getChildWarehouseIds(warehouseId, warehouseIds);
|
||||
|
||||
return warehouseIds;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归获取子仓库ID
|
||||
* @param parentId 父仓库ID
|
||||
* @param warehouseIds 仓库ID列表(用于收集结果)
|
||||
*/
|
||||
private void getChildWarehouseIds(Long parentId, List<Long> warehouseIds) {
|
||||
// 查询直接子仓库
|
||||
List<WmsWarehouse> children = warehouseMapper.selectList(
|
||||
Wrappers.<WmsWarehouse>lambdaQuery()
|
||||
.eq(WmsWarehouse::getParentId, parentId)
|
||||
.eq(WmsWarehouse::getDelFlag, 0)
|
||||
);
|
||||
// 递归处理每个子仓库
|
||||
for (WmsWarehouse child : children) {
|
||||
warehouseIds.add(child.getWarehouseId());
|
||||
getChildWarehouseIds(child.getWarehouseId(), warehouseIds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user