feat(wms): 新增钢卷待操作联查
- 在WmsCoilPendingActionMapper中添加selectVoPagePlus方法支持自定义查询 - 在WmsCoilPendingActionMapper.xml中实现selectVoPagePlus的SQL映射逻辑 - 修改WmsCoilPendingActionServiceImpl中的queryPageList方法以使用新的查询方式 - 新增buildQueryWrapperPlus方法构建更复杂的查询条件 - 在WmsCoilPendingActionVo中增加enterCoilNo、supplierCoilNo、itemId和itemType字段用于展示更多信息
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
@@ -45,11 +46,27 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsCoilPendingActionVo> queryPageList(WmsCoilPendingActionBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
QueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapperPlus(bo);
|
||||
Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
private QueryWrapper<WmsCoilPendingAction> buildQueryWrapperPlus(WmsCoilPendingActionBo bo) {
|
||||
QueryWrapper<WmsCoilPendingAction> qw = Wrappers.query();
|
||||
qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId());
|
||||
qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo());
|
||||
qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
|
||||
qw.eq(bo.getActionStatus() != null, "wcpa.action_status", bo.getActionStatus());
|
||||
qw.eq(bo.getWarehouseId() != null, "wcpa.warehouse_id", bo.getWarehouseId());
|
||||
qw.eq(bo.getPriority() != null, "wcpa.priority", bo.getPriority());
|
||||
qw.like(StringUtils.isNotBlank(bo.getSourceType()), "wcpa.source_type", bo.getSourceType());
|
||||
qw.orderByDesc("wcpa.create_time");
|
||||
qw.orderByDesc("wcpa.scan_time");
|
||||
//逻辑删除
|
||||
qw.eq("wcpa.del_flag", 0);
|
||||
return qw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询钢卷待操作列表
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user