refactor(wms): 重构实际库区/库位自关联模块
- 移除分页相关依赖和方法,简化查询逻辑 - 将实体类继承关系从BaseEntity改为TreeEntity以支持树形结构 - 更新业务对象WmsActualWarehouseBo继承TreeEntity - 修改控制器返回类型为R<List<WmsActualWarehouseVo>> - 删除IWmsActualWarehouseService中的queryPageList方法 - 调整Service实现类中列表查询方法为queryList - 更新所有涉及该模块的日期注解至最新时间
This commit is contained in:
@@ -20,13 +20,12 @@ import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.domain.vo.WmsActualWarehouseVo;
|
||||
import com.klp.domain.bo.WmsActualWarehouseBo;
|
||||
import com.klp.service.IWmsActualWarehouseService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 实际库区/库位自关联
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@@ -40,8 +39,9 @@ public class WmsActualWarehouseController extends BaseController {
|
||||
* 查询实际库区/库位自关联列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsActualWarehouseVo> list(WmsActualWarehouseBo bo, PageQuery pageQuery) {
|
||||
return iWmsActualWarehouseService.queryPageList(bo, pageQuery);
|
||||
public R<List<WmsActualWarehouseVo>> list(WmsActualWarehouseBo bo) {
|
||||
List<WmsActualWarehouseVo> list = iWmsActualWarehouseService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import com.klp.common.core.domain.TreeEntity;
|
||||
|
||||
/**
|
||||
* 实际库区/库位自关联对象 wms_actual_warehouse
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_actual_warehouse")
|
||||
public class WmsActualWarehouse extends BaseEntity {
|
||||
public class WmsActualWarehouse extends TreeEntity<WmsActualWarehouse> {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import com.klp.common.core.domain.TreeEntity;
|
||||
|
||||
/**
|
||||
* 实际库区/库位自关联业务对象 wms_actual_warehouse
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsActualWarehouseBo extends BaseEntity {
|
||||
public class WmsActualWarehouseBo extends TreeEntity<WmsActualWarehouseBo> {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
|
||||
@@ -11,7 +11,7 @@ import lombok.Data;
|
||||
* 实际库区/库位自关联视图对象 wms_actual_warehouse
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
|
||||
@@ -8,7 +8,7 @@ import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
* 实际库区/库位自关联Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
public interface WmsActualWarehouseMapper extends BaseMapperPlus<WmsActualWarehouseMapper, WmsActualWarehouse, WmsActualWarehouseVo> {
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@ package com.klp.service;
|
||||
import com.klp.domain.WmsActualWarehouse;
|
||||
import com.klp.domain.vo.WmsActualWarehouseVo;
|
||||
import com.klp.domain.bo.WmsActualWarehouseBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -13,7 +11,7 @@ import java.util.List;
|
||||
* 实际库区/库位自关联Service接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
public interface IWmsActualWarehouseService {
|
||||
|
||||
@@ -22,10 +20,6 @@ public interface IWmsActualWarehouseService {
|
||||
*/
|
||||
WmsActualWarehouseVo queryById(Long actualWarehouseId);
|
||||
|
||||
/**
|
||||
* 查询实际库区/库位自关联列表
|
||||
*/
|
||||
TableDataInfo<WmsActualWarehouseVo> queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询实际库区/库位自关联列表
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
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;
|
||||
@@ -23,7 +20,7 @@ import java.util.Collection;
|
||||
* 实际库区/库位自关联Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-11-03
|
||||
* @date 2025-11-24
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
@@ -39,15 +36,6 @@ public class WmsActualWarehouseServiceImpl implements IWmsActualWarehouseService
|
||||
return baseMapper.selectVoById(actualWarehouseId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询实际库区/库位自关联列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsActualWarehouseVo> queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsActualWarehouse> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsActualWarehouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询实际库区/库位自关联列表
|
||||
|
||||
Reference in New Issue
Block a user