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