From df21ce24d77e0d3439d9f654f0780ab1a4827718 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 24 Nov 2025 11:32:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E9=87=8D=E6=9E=84=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=BA=93=E5=8C=BA/=E5=BA=93=E4=BD=8D=E8=87=AA?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除分页相关依赖和方法，简化查询逻辑 - 将实体类继承关系从BaseEntity改为TreeEntity以支持树形结构 - 更新业务对象WmsActualWarehouseBo继承TreeEntity - 修改控制器返回类型为R> - 删除IWmsActualWarehouseService中的queryPageList方法 - 调整Service实现类中列表查询方法为queryList - 更新所有涉及该模块的日期注解至最新时间 --- .../controller/WmsActualWarehouseController.java | 8 ++++---- .../java/com/klp/domain/WmsActualWarehouse.java | 6 +++--- .../com/klp/domain/bo/WmsActualWarehouseBo.java | 6 +++--- .../com/klp/domain/vo/WmsActualWarehouseVo.java | 2 +- .../com/klp/mapper/WmsActualWarehouseMapper.java | 2 +- .../klp/service/IWmsActualWarehouseService.java | 8 +------- .../impl/WmsActualWarehouseServiceImpl.java | 14 +------------- 7 files changed, 14 insertions(+), 32 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java b/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java index 070f2658..8100c35a 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsActualWarehouseController.java @@ -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 list(WmsActualWarehouseBo bo, PageQuery pageQuery) { - return iWmsActualWarehouseService.queryPageList(bo, pageQuery); + public R> list(WmsActualWarehouseBo bo) { + List list = iWmsActualWarehouseService.queryList(bo); + return R.ok(list); } /** diff --git a/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java b/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java index 0f9641c2..a17883d7 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java @@ -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 { private static final long serialVersionUID=1L; diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java index 39f21e62..d93b42fa 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java @@ -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 { /** * 主键ID diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java index 9dfd00a8..17a3e5e2 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java @@ -11,7 +11,7 @@ import lombok.Data; * 实际库区/库位自关联视图对象 wms_actual_warehouse * * @author klp - * @date 2025-11-03 + * @date 2025-11-24 */ @Data @ExcelIgnoreUnannotated diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java index 2f441a9f..719499a1 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsActualWarehouseMapper.java @@ -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 { diff --git a/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java b/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java index f36be626..9805974c 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsActualWarehouseService.java @@ -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 queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery); /** * 查询实际库区/库位自关联列表 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java index 894d99a3..16a011f1 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsActualWarehouseServiceImpl.java @@ -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 queryPageList(WmsActualWarehouseBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } /** * 查询实际库区/库位自关联列表