From 1c1f7d92e2c7db33dd9072e56242e8ea3f9e25e8 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 24 Nov 2025 11:41:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=BB=93=E5=BA=93=E7=88=B6=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 WmsActualWarehouse 类中的 actualParentId 字段重命名为 parentId - 更新对应的数据库映射文件 WmsActualWarehouseMapper.xml 中的字段映射 - 修改服务实现类中对父节点ID的引用逻辑 - 同步更新业务对象 WmsActualWarehouseBo 和视图对象 WmsActualWarehouseVo 中的相关字段名 - 调整查询条件构造器中使用的属性名称以匹配新的字段定义 --- klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java | 2 +- .../src/main/java/com/klp/domain/bo/WmsActualWarehouseBo.java | 2 +- .../src/main/java/com/klp/domain/vo/WmsActualWarehouseVo.java | 2 +- .../com/klp/service/impl/WmsActualWarehouseServiceImpl.java | 2 +- .../src/main/java/com/klp/service/impl/WmsStockServiceImpl.java | 2 +- .../src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 a17883d7..a6acaadc 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsActualWarehouse.java @@ -27,7 +27,7 @@ public class WmsActualWarehouse extends TreeEntity { /** * 父节点ID（指向同表 warehouse_id） */ - private Long actualParentId; + private Long parentId; /** * 实际库区/库位编码 */ 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 d93b42fa..60ee0ab5 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 @@ -25,7 +25,7 @@ public class WmsActualWarehouseBo extends TreeEntity { /** * 父节点ID（指向同表 warehouse_id） */ - private Long actualParentId; + private Long parentId; /** * 实际库区/库位编码 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 17a3e5e2..6fff2e15 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 @@ -30,7 +30,7 @@ public class WmsActualWarehouseVo { */ @ExcelProperty(value = "父节点ID", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "指=向同表,w=arehouse_id") - private Long actualParentId; + private Long parentId; /** * 实际库区/库位编码 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 16a011f1..262453f8 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 @@ -49,7 +49,7 @@ public class WmsActualWarehouseServiceImpl implements IWmsActualWarehouseService private LambdaQueryWrapper buildQueryWrapper(WmsActualWarehouseBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getActualParentId() != null, WmsActualWarehouse::getActualParentId, bo.getActualParentId()); + lqw.eq(bo.getParentId() != null, WmsActualWarehouse::getParentId, bo.getParentId()); lqw.eq(StringUtils.isNotBlank(bo.getActualWarehouseCode()), WmsActualWarehouse::getActualWarehouseCode, bo.getActualWarehouseCode()); lqw.like(StringUtils.isNotBlank(bo.getActualWarehouseName()), WmsActualWarehouse::getActualWarehouseName, bo.getActualWarehouseName()); lqw.eq(bo.getActualWarehouseType() != null, WmsActualWarehouse::getActualWarehouseType, bo.getActualWarehouseType()); diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java index 8127583e..0d65da34 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java @@ -116,7 +116,7 @@ public class WmsStockServiceImpl implements IWmsStockService { // 查询直接子仓库 List children = actualWarehouseMapper.selectList( Wrappers.lambdaQuery() - .eq(WmsActualWarehouse::getActualParentId, parentId) + .eq(WmsActualWarehouse::getParentId, parentId) .eq(WmsActualWarehouse::getDelFlag, 0) ); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml index fc6ef8fa..3e75a79b 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsActualWarehouseMapper.xml @@ -6,7 +6,7 @@ - +