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 @@ - +