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

修改表格导出问题

Browse Source
This commit is contained in:
Joshi
2025-07-30 16:19:15 +08:00
parent c33ad20bbc
commit d699efca54
5 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
*/
@Override
public TableDataInfo<WmsStockVo> queryPageList(WmsStockBo bo, PageQuery pageQuery) {
QueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
QueryWrapper<WmsStock> lqw = buildQueryWrapperPlus(bo);
Page<WmsStockVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -60,11 +60,21 @@ public class WmsStockServiceImpl implements IWmsStockService {
*/
@Override
public List<WmsStockVo> queryList(WmsStockBo bo) {
QueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
LambdaQueryWrapper<WmsStock> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsStock> buildQueryWrapper(WmsStockBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsStock> 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<WmsStock> buildQueryWrapper(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper
private QueryWrapper<WmsStock> buildQueryWrapperPlus(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper
Map<String, Object> params = bo.getParams();
QueryWrapper<WmsStock> 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<Long> getWarehouseIdsWithChildren(Long warehouseId) {
List<Long> 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());