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

使用querywapper代替lamdbaquerywapper解决联查问题

Browse Source
This commit is contained in:
Joshi
2025-07-21 09:41:58 +08:00
parent 8c5c2774fc
commit f9804c27c3
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.klp.service.impl; package com.klp.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery; import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,7 +46,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
*/ */
@Override @Override
public TableDataInfo<WmsStockVo> queryPageList(WmsStockBo bo, PageQuery pageQuery) { public TableDataInfo<WmsStockVo> queryPageList(WmsStockBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsStock> lqw = buildQueryWrapper(bo); QueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
Page<WmsStockVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); Page<WmsStockVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@@ -55,20 +56,26 @@ public class WmsStockServiceImpl implements IWmsStockService {
*/ */
@Override @Override
public List<WmsStockVo> queryList(WmsStockBo bo) { public List<WmsStockVo> queryList(WmsStockBo bo) {
LambdaQueryWrapper<WmsStock> lqw = buildQueryWrapper(bo); QueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw); return baseMapper.selectVoList(lqw);
} }
private LambdaQueryWrapper<WmsStock> buildQueryWrapper(WmsStockBo bo) { private QueryWrapper<WmsStock> buildQueryWrapper(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsStock> lqw = Wrappers.lambdaQuery(); QueryWrapper<WmsStock> qw = Wrappers.query(); // 使用普通 QueryWrapper
lqw.eq(bo.getWarehouseId() != null, WmsStock::getWarehouseId, bo.getWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getItemType()), WmsStock::getItemType, bo.getItemType()); // 1. 明确指定 wms_stock 表的 del_flag（表别名 s）
lqw.eq(bo.getItemId() != null, WmsStock::getItemId, bo.getItemId()); qw.eq("s.del_flag", 0);
lqw.eq(bo.getQuantity() != null, WmsStock::getQuantity, bo.getQuantity());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), WmsStock::getUnit, bo.getUnit()); // 2. 其他条件也明确指定表别名 s（因为都是 wms_stock 表的字段）
lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsStock::getBatchNo, bo.getBatchNo()); qw.eq(bo.getWarehouseId() != null, "s.warehouse_id", bo.getWarehouseId());
return lqw; 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());
qw.eq(StringUtils.isNotBlank(bo.getUnit()), "s.unit", bo.getUnit());
qw.eq(StringUtils.isNotBlank(bo.getBatchNo()), "s.batch_no", bo.getBatchNo());
return qw;
} }
/** /**

1
klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
View File

@@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM wms_stock s FROM wms_stock s
LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id
LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id
WHERE s.del_flag = 0
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>