From 88d2d864b296f407eb650b2c01f54d45b204ca31 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 27 Jun 2026 14:11:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(inventory):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=E4=BB=93=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81=E5=A4=9A=E5=BA=93?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 warehouseId 字段从 Long 类型改为 String 类型，支持逗号分隔的多个库区ID - 将 actualWarehouseId 字段从 Long 类型改为 String 类型，支持逗号分隔的多个实际库区ID - 更新实体类、业务对象、视图对象中的字段类型定义 - 修改数据库映射文件中的字段映射关系 - 调整查询条件构造逻辑，使用模糊匹配替代精确匹配 - 更新字段注释说明多库区支持功能 --- .../java/com/klp/flow/domain/InvCountPlanWarehouse.java | 8 ++++---- .../com/klp/flow/domain/bo/InvCountPlanWarehouseBo.java | 8 ++++---- .../com/klp/flow/domain/vo/InvCountPlanWarehouseVo.java | 8 ++++---- .../service/impl/InvCountPlanWarehouseServiceImpl.java | 4 ++-- .../resources/mapper/flow/InvCountPlanWarehouseMapper.xml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/klp-flow/src/main/java/com/klp/flow/domain/InvCountPlanWarehouse.java b/klp-flow/src/main/java/com/klp/flow/domain/InvCountPlanWarehouse.java index df24e352e..1210a7bdb 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/InvCountPlanWarehouse.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/InvCountPlanWarehouse.java @@ -32,17 +32,17 @@ public class InvCountPlanWarehouse extends BaseEntity { */ private Long planId; /** - * 逻辑库区ID + * 逻辑库区ID（逗号分隔） */ - private Long warehouseId; + private String warehouseIds; /** * 逻辑库区名称（冗余） */ private String warehouseName; /** - * 实际库区ID + * 实际库区ID（逗号分隔） */ - private Long actualWarehouseId; + private String actualWarehouseIds; /** * 实际库区名称（冗余） */ diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanWarehouseBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanWarehouseBo.java index ac6fbd5d6..e20d133c2 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanWarehouseBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanWarehouseBo.java @@ -31,9 +31,9 @@ public class InvCountPlanWarehouseBo extends BaseEntity { private Long planId; /** - * 逻辑库区ID + * 逻辑库区ID（逗号分隔） */ - private Long warehouseId; + private String warehouseIds; /** * 逻辑库区名称（冗余） @@ -41,9 +41,9 @@ public class InvCountPlanWarehouseBo extends BaseEntity { private String warehouseName; /** - * 实际库区ID + * 实际库区ID（逗号分隔） */ - private Long actualWarehouseId; + private String actualWarehouseIds; /** * 实际库区名称（冗余） diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/InvCountPlanWarehouseVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/InvCountPlanWarehouseVo.java index 4c6596769..b2671b4dc 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/vo/InvCountPlanWarehouseVo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/InvCountPlanWarehouseVo.java @@ -35,10 +35,10 @@ public class InvCountPlanWarehouseVo { private Long planId; /** - * 逻辑库区ID + * 逻辑库区ID（逗号分隔） */ @ExcelProperty(value = "逻辑库区ID") - private Long warehouseId; + private String warehouseIds; /** * 逻辑库区名称（冗余） @@ -48,10 +48,10 @@ public class InvCountPlanWarehouseVo { private String warehouseName; /** - * 实际库区ID + * 实际库区ID（逗号分隔） */ @ExcelProperty(value = "实际库区ID") - private Long actualWarehouseId; + private String actualWarehouseIds; /** * 实际库区名称（冗余） diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/InvCountPlanWarehouseServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/InvCountPlanWarehouseServiceImpl.java index 8ee841f95..843505efc 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/InvCountPlanWarehouseServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/InvCountPlanWarehouseServiceImpl.java @@ -62,9 +62,9 @@ public class InvCountPlanWarehouseServiceImpl implements IInvCountPlanWarehouseS Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getPlanId() != null, InvCountPlanWarehouse::getPlanId, bo.getPlanId()); - lqw.eq(bo.getWarehouseId() != null, InvCountPlanWarehouse::getWarehouseId, bo.getWarehouseId()); + lqw.like(StringUtils.isNotBlank(bo.getWarehouseIds()), InvCountPlanWarehouse::getWarehouseIds, bo.getWarehouseIds()); lqw.like(StringUtils.isNotBlank(bo.getWarehouseName()), InvCountPlanWarehouse::getWarehouseName, bo.getWarehouseName()); - lqw.eq(bo.getActualWarehouseId() != null, InvCountPlanWarehouse::getActualWarehouseId, bo.getActualWarehouseId()); + lqw.like(StringUtils.isNotBlank(bo.getActualWarehouseIds()), InvCountPlanWarehouse::getActualWarehouseIds, bo.getActualWarehouseIds()); lqw.like(StringUtils.isNotBlank(bo.getActualWarehouseName()), InvCountPlanWarehouse::getActualWarehouseName, bo.getActualWarehouseName()); lqw.eq(bo.getSystemCoilCount() != null, InvCountPlanWarehouse::getSystemCoilCount, bo.getSystemCoilCount()); lqw.eq(bo.getSystemTotalWeight() != null, InvCountPlanWarehouse::getSystemTotalWeight, bo.getSystemTotalWeight()); diff --git a/klp-flow/src/main/resources/mapper/flow/InvCountPlanWarehouseMapper.xml b/klp-flow/src/main/resources/mapper/flow/InvCountPlanWarehouseMapper.xml index c8d06fa04..19783192b 100644 --- a/klp-flow/src/main/resources/mapper/flow/InvCountPlanWarehouseMapper.xml +++ b/klp-flow/src/main/resources/mapper/flow/InvCountPlanWarehouseMapper.xml @@ -7,9 +7,9 @@ - + - +