DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(inventory): 修改盘点计划仓库字段类型支持多库区

Browse Source 
- 将 warehouseId 字段从 Long 类型改为 String 类型，支持逗号分隔的多个库区ID
- 将 actualWarehouseId 字段从 Long 类型改为 String 类型，支持逗号分隔的多个实际库区ID
- 更新实体类、业务对象、视图对象中的字段类型定义
- 修改数据库映射文件中的字段映射关系
- 调整查询条件构造逻辑，使用模糊匹配替代精确匹配
- 更新字段注释说明多库区支持功能
This commit is contained in:
Joshi
2026-06-27 14:11:33 +08:00
parent 5a3759b502
commit 88d2d864b2
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-flow/src/main/java/com/klp/flow/domain/InvCountPlanWarehouse.java
View File

@@ -32,17 +32,17 @@ public class InvCountPlanWarehouse extends BaseEntity {
*/ */
private Long planId; private Long planId;
/** /**
* 逻辑库区ID * 逻辑库区ID（逗号分隔）
*/ */
private Long warehouseId; private String warehouseIds;
/** /**
* 逻辑库区名称（冗余） * 逻辑库区名称（冗余）
*/ */
private String warehouseName; private String warehouseName;
/** /**
* 实际库区ID * 实际库区ID（逗号分隔）
*/ */
private Long actualWarehouseId; private String actualWarehouseIds;
/** /**
* 实际库区名称（冗余） * 实际库区名称（冗余）
*/ */

8
klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanWarehouseBo.java
View File

@@ -31,9 +31,9 @@ public class InvCountPlanWarehouseBo extends BaseEntity {
private Long planId; private Long planId;
/** /**
* 逻辑库区ID * 逻辑库区ID（逗号分隔）
*/ */
private Long warehouseId; private String warehouseIds;
/** /**
* 逻辑库区名称（冗余） * 逻辑库区名称（冗余）
@@ -41,9 +41,9 @@ public class InvCountPlanWarehouseBo extends BaseEntity {
private String warehouseName; private String warehouseName;
/** /**
* 实际库区ID * 实际库区ID（逗号分隔）
*/ */
private Long actualWarehouseId; private String actualWarehouseIds;
/** /**
* 实际库区名称（冗余） * 实际库区名称（冗余）

8
klp-flow/src/main/java/com/klp/flow/domain/vo/InvCountPlanWarehouseVo.java
View File

@@ -35,10 +35,10 @@ public class InvCountPlanWarehouseVo {
private Long planId; private Long planId;
/** /**
* 逻辑库区ID * 逻辑库区ID（逗号分隔）
*/ */
@ExcelProperty(value = "逻辑库区ID") @ExcelProperty(value = "逻辑库区ID")
private Long warehouseId; private String warehouseIds;
/** /**
* 逻辑库区名称（冗余） * 逻辑库区名称（冗余）
@@ -48,10 +48,10 @@ public class InvCountPlanWarehouseVo {
private String warehouseName; private String warehouseName;
/** /**
* 实际库区ID * 实际库区ID（逗号分隔）
*/ */
@ExcelProperty(value = "实际库区ID") @ExcelProperty(value = "实际库区ID")
private Long actualWarehouseId; private String actualWarehouseIds;
/** /**
* 实际库区名称（冗余） * 实际库区名称（冗余）

4
klp-flow/src/main/java/com/klp/flow/service/impl/InvCountPlanWarehouseServiceImpl.java
View File

@@ -62,9 +62,9 @@ public class InvCountPlanWarehouseServiceImpl implements IInvCountPlanWarehouseS
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InvCountPlanWarehouse> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<InvCountPlanWarehouse> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getPlanId() != null, InvCountPlanWarehouse::getPlanId, bo.getPlanId()); 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.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.like(StringUtils.isNotBlank(bo.getActualWarehouseName()), InvCountPlanWarehouse::getActualWarehouseName, bo.getActualWarehouseName());
lqw.eq(bo.getSystemCoilCount() != null, InvCountPlanWarehouse::getSystemCoilCount, bo.getSystemCoilCount()); lqw.eq(bo.getSystemCoilCount() != null, InvCountPlanWarehouse::getSystemCoilCount, bo.getSystemCoilCount());
lqw.eq(bo.getSystemTotalWeight() != null, InvCountPlanWarehouse::getSystemTotalWeight, bo.getSystemTotalWeight()); lqw.eq(bo.getSystemTotalWeight() != null, InvCountPlanWarehouse::getSystemTotalWeight, bo.getSystemTotalWeight());

4
klp-flow/src/main/resources/mapper/flow/InvCountPlanWarehouseMapper.xml
View File

@@ -7,9 +7,9 @@
<resultMap type="com.klp.flow.domain.InvCountPlanWarehouse" id="InvCountPlanWarehouseResult"> <resultMap type="com.klp.flow.domain.InvCountPlanWarehouse" id="InvCountPlanWarehouseResult">
<result property="relId" column="rel_id"/> <result property="relId" column="rel_id"/>
<result property="planId" column="plan_id"/> <result property="planId" column="plan_id"/>
<result property="warehouseId" column="warehouse_id"/> <result property="warehouseIds" column="warehouse_id"/>
<result property="warehouseName" column="warehouse_name"/> <result property="warehouseName" column="warehouse_name"/>
<result property="actualWarehouseId" column="actual_warehouse_id"/> <result property="actualWarehouseIds" column="actual_warehouse_id"/>
<result property="actualWarehouseName" column="actual_warehouse_name"/> <result property="actualWarehouseName" column="actual_warehouse_name"/>
<result property="systemCoilCount" column="system_coil_count"/> <result property="systemCoilCount" column="system_coil_count"/>
<result property="systemTotalWeight" column="system_total_weight"/> <result property="systemTotalWeight" column="system_total_weight"/>