From d699efca54fc9fac9711bd9995fa7a4934a1221e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 30 Jul 2025 16:19:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WmsOrderDetailServiceImpl.java | 15 +++++++++--- .../impl/WmsProductBomServiceImpl.java | 15 +++++++++--- .../WmsPurchasePlanDetailServiceImpl.java | 16 ++++++++++--- .../impl/WmsStockIoDetailServiceImpl.java | 18 +++++++++++--- .../klp/service/impl/WmsStockServiceImpl.java | 24 +++++++++++++------ 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java index 72f25e8a..2ae59e15 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java @@ -45,7 +45,7 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService { */ @Override public TableDataInfo queryPageList(WmsOrderDetailBo bo, PageQuery pageQuery) { - QueryWrapper qw = buildQueryWrapper(bo); + QueryWrapper qw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); return TableDataInfo.build(result); } @@ -55,11 +55,20 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService { */ @Override public List queryList(WmsOrderDetailBo bo) { - QueryWrapper qw = buildQueryWrapper(bo); + LambdaQueryWrapper qw = buildQueryWrapper(bo); return baseMapper.selectVoList(qw); } + private LambdaQueryWrapper buildQueryWrapper(WmsOrderDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(bo.getOrderId() != null, WmsOrderDetail::getOrderId, bo.getOrderId()); + lqw.eq(bo.getProductId() != null, WmsOrderDetail::getProductId, bo.getProductId()); + lqw.eq(bo.getQuantity() != null, WmsOrderDetail::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsOrderDetail::getUnit, bo.getUnit()); + return lqw; + } - private QueryWrapper buildQueryWrapper(WmsOrderDetailBo bo) { + private QueryWrapper buildQueryWrapperPlus(WmsOrderDetailBo bo) { Map params = bo.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("d.del_flag", 0); // 手动添加逻辑删除条件 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java index 8df6bd84..c7cc9441 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java @@ -45,7 +45,7 @@ public class WmsProductBomServiceImpl implements IWmsProductBomService { */ @Override public TableDataInfo queryPageList(WmsProductBomBo bo, PageQuery pageQuery) { - QueryWrapper qw = buildQueryWrapper(bo); + QueryWrapper qw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); return TableDataInfo.build(result); } @@ -55,11 +55,20 @@ public class WmsProductBomServiceImpl implements IWmsProductBomService { */ @Override public List queryList(WmsProductBomBo bo) { - QueryWrapper qw = buildQueryWrapper(bo); + LambdaQueryWrapper qw = buildQueryWrapper(bo); return baseMapper.selectVoList(qw); } + private LambdaQueryWrapper buildQueryWrapper(WmsProductBomBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(bo.getProductId() != null, WmsProductBom::getProductId, bo.getProductId()); + lqw.eq(bo.getRawMaterialId() != null, WmsProductBom::getRawMaterialId, bo.getRawMaterialId()); + lqw.eq(bo.getQuantity() != null, WmsProductBom::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsProductBom::getUnit, bo.getUnit()); + return lqw; + } - private QueryWrapper buildQueryWrapper(WmsProductBomBo bo) { + private QueryWrapper buildQueryWrapperPlus(WmsProductBomBo bo) { Map params = bo.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("b.del_flag", 0); // 手动添加逻辑删除条件 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java index 3a77204c..19505ce5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanDetailServiceImpl.java @@ -45,7 +45,7 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS */ @Override public TableDataInfo queryPageList(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) { - QueryWrapper qw = buildQueryWrapper(bo); + QueryWrapper qw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); return TableDataInfo.build(result); } @@ -55,11 +55,21 @@ public class WmsPurchasePlanDetailServiceImpl implements IWmsPurchasePlanDetailS */ @Override public List queryList(WmsPurchasePlanDetailBo bo) { - QueryWrapper qw = buildQueryWrapper(bo); + LambdaQueryWrapper qw = buildQueryWrapper(bo); return baseMapper.selectVoList(qw); } + private LambdaQueryWrapper buildQueryWrapper(WmsPurchasePlanDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(bo.getPlanId() != null, WmsPurchasePlanDetail::getPlanId, bo.getPlanId()); + lqw.eq(bo.getRawMaterialId() != null, WmsPurchasePlanDetail::getRawMaterialId, bo.getRawMaterialId()); + lqw.eq(StringUtils.isNotBlank(bo.getOwner()), WmsPurchasePlanDetail::getOwner, bo.getOwner()); + lqw.eq(bo.getQuantity() != null, WmsPurchasePlanDetail::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsPurchasePlanDetail::getUnit, bo.getUnit()); + return lqw; + } - private QueryWrapper buildQueryWrapper(WmsPurchasePlanDetailBo bo) { + private QueryWrapper buildQueryWrapperPlus(WmsPurchasePlanDetailBo bo) { Map params = bo.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("wpd.del_flag", 0); // 手动添加逻辑删除条件 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java index a3eff549..0210512f 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java @@ -51,7 +51,7 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService { */ @Override public TableDataInfo queryPageList(WmsStockIoDetailBo bo, PageQuery pageQuery) { - QueryWrapper qw = buildQueryWrapper(bo); + QueryWrapper qw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); return TableDataInfo.build(result); } @@ -61,11 +61,23 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService { */ @Override public List queryList(WmsStockIoDetailBo bo) { - QueryWrapper qw = buildQueryWrapper(bo); + LambdaQueryWrapper qw = buildQueryWrapper(bo); return baseMapper.selectVoList(qw); } + private LambdaQueryWrapper buildQueryWrapper(WmsStockIoDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(bo.getStockIoId() != null, WmsStockIoDetail::getStockIoId, bo.getStockIoId()); + lqw.eq(bo.getWarehouseId() != null, WmsStockIoDetail::getWarehouseId, bo.getWarehouseId()); + lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsStockIoDetail::getItemType, bo.getItemType()); + lqw.eq(bo.getItemId() != null, WmsStockIoDetail::getItemId, bo.getItemId()); + lqw.eq(bo.getQuantity() != null, WmsStockIoDetail::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsStockIoDetail::getUnit, bo.getUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsStockIoDetail::getBatchNo, bo.getBatchNo()); + return lqw; + } - private QueryWrapper buildQueryWrapper(WmsStockIoDetailBo bo) { + private QueryWrapper buildQueryWrapperPlus(WmsStockIoDetailBo bo) { Map params = bo.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("d.del_flag", 0); // 手动添加逻辑删除条件 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 10314a42..e470c4c5 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 @@ -50,7 +50,7 @@ public class WmsStockServiceImpl implements IWmsStockService { */ @Override public TableDataInfo queryPageList(WmsStockBo bo, PageQuery pageQuery) { - QueryWrapper lqw = buildQueryWrapper(bo); + QueryWrapper lqw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -60,11 +60,21 @@ public class WmsStockServiceImpl implements IWmsStockService { */ @Override public List queryList(WmsStockBo bo) { - QueryWrapper lqw = buildQueryWrapper(bo); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } + private LambdaQueryWrapper buildQueryWrapper(WmsStockBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsStock::getItemType, bo.getItemType()); + lqw.eq(bo.getItemId() != null, WmsStock::getItemId, bo.getItemId()); + lqw.eq(bo.getQuantity() != null, WmsStock::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsStock::getUnit, bo.getUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsStock::getBatchNo, bo.getBatchNo()); + return lqw; + } - private QueryWrapper buildQueryWrapper(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper + private QueryWrapper buildQueryWrapperPlus(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper Map params = bo.getParams(); QueryWrapper qw = Wrappers.query(); // 使用普通 QueryWrapper qw.eq("s.del_flag", 0); // 手动添加逻辑删除条件 @@ -78,7 +88,7 @@ public class WmsStockServiceImpl implements IWmsStockService { qw.in("s.warehouse_id", warehouseIds); } } - + qw.eq(StringUtils.isNotBlank(bo.getItemType()), "s.item_type", bo.getItemType()); qw.eq(bo.getItemId() != null, "s.item_id", bo.getItemId()); qw.eq(bo.getQuantity() != null, "s.quantity", bo.getQuantity()); @@ -143,10 +153,10 @@ public class WmsStockServiceImpl implements IWmsStockService { private List getWarehouseIdsWithChildren(Long warehouseId) { List warehouseIds = new ArrayList<>(); warehouseIds.add(warehouseId); // 添加当前仓库ID - + // 递归获取所有子仓库ID getChildWarehouseIds(warehouseId, warehouseIds); - + return warehouseIds; } @@ -162,7 +172,7 @@ public class WmsStockServiceImpl implements IWmsStockService { .eq(WmsWarehouse::getParentId, parentId) .eq(WmsWarehouse::getDelFlag, 0) ); - + // 递归处理每个子仓库 for (WmsWarehouse child : children) { warehouseIds.add(child.getWarehouseId());