From 623e78629d53317d239908b2d47ea8fc27d984cb Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 16 Apr 2026 14:03:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(warehouse):=20=E6=B7=BB=E5=8A=A0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BD=BF=E7=94=A8=E6=AC=A1=E6=95=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsWarehouse实体类中新增useCount字段及注释 - 在WmsWarehouseBo业务对象中添加useCount属性 - 更新WmsWarehouseMapper.xml映射文件,增加useCount字段映射 - 在WmsWarehouseServiceImpl查询条件中加入useCount过滤逻辑 - 在WmsWarehouseVo视图对象中添加useCount字段并配置Excel导出 --- klp-wms/src/main/java/com/klp/domain/WmsWarehouse.java | 4 ++++ klp-wms/src/main/java/com/klp/domain/bo/WmsWarehouseBo.java | 5 +++++ klp-wms/src/main/java/com/klp/domain/vo/WmsWarehouseVo.java | 6 ++++++ .../java/com/klp/service/impl/WmsWarehouseServiceImpl.java | 1 + .../src/main/resources/mapper/klp/WmsWarehouseMapper.xml | 1 + 5 files changed, 17 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsWarehouse.java b/klp-wms/src/main/java/com/klp/domain/WmsWarehouse.java index 0419e5ef..90a5f4b3 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsWarehouse.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsWarehouse.java @@ -40,6 +40,10 @@ public class WmsWarehouse extends TreeEntity { * 同级排序号 */ private Long sortNo; + /** + * 使用次数(用于排序:使用越多越靠前) + */ + private Integer useCount; /** * 是否启用(0=否,1=是) */ 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 46fa673b..081f3b3c 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 @@ -47,6 +47,11 @@ public class WmsWarehouseBo extends TreeEntity { */ private Long sortNo; + /** + * 使用次数(用于排序:使用越多越靠前) + */ + private Integer useCount; + /** * 是否启用(0=否,1=是) */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsWarehouseVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsWarehouseVo.java index b0ae0c59..358c4edb 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsWarehouseVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsWarehouseVo.java @@ -56,6 +56,12 @@ public class WmsWarehouseVo { @ExcelProperty(value = "同级排序号") private Long sortNo; + /** + * 使用次数(用于排序:使用越多越靠前) + */ + @ExcelProperty(value = "使用次数") + private Integer useCount; + /** * 是否启用(0=否,1=是) */ 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 b984bae2..a3b4e7d4 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 @@ -54,6 +54,7 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService { lqw.like(StringUtils.isNotBlank(bo.getWarehouseName()), WmsWarehouse::getWarehouseName, bo.getWarehouseName()); lqw.eq(bo.getWarehouseType() != null, WmsWarehouse::getWarehouseType, bo.getWarehouseType()); 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); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsWarehouseMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsWarehouseMapper.xml index 08ed0876..4aa33ec5 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsWarehouseMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsWarehouseMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +