feat(wms): 新增财务单据查询接口并优化相关功能
- 在 IWmsFinancialDocumentService接口中新增 queryPageListDetail 方法 - 在 WmsFinancialDocumentController 中添加 ListListDetail 控制器方法 - 在 WmsFinancialDocumentMapper 接口中新增 selectVoPageDetail 方法 - 在 WmsFinancialDocumentMapper.xml 中添加新的 SQL 查询语句 - 在 WmsFinancialDocumentServiceImpl 中实现 queryPageListDetail 方法 - 更新 WmsFinancialDocumentVo 和 WmsJournalEntryVo 类以支持明细列表查询
This commit is contained in:
@@ -43,6 +43,11 @@ public class WmsFinancialDocumentController extends BaseController {
|
||||
public TableDataInfo<WmsFinancialDocumentVo> list(WmsFinancialDocumentBo bo, PageQuery pageQuery) {
|
||||
return iWmsFinancialDocumentService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
//新增查询接口
|
||||
@GetMapping("/ListDetail")
|
||||
public TableDataInfo<WmsFinancialDocumentVo> ListListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery) {
|
||||
return iWmsFinancialDocumentService.queryPageListDetail(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出财务单据列表
|
||||
|
||||
@@ -2,6 +2,8 @@ package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@@ -72,5 +74,8 @@ public class WmsFinancialDocumentVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
//明细列表
|
||||
private List<WmsJournalEntryVo> detailList;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ public class WmsJournalEntryVo {
|
||||
* 分录ID(主键)
|
||||
*/
|
||||
@ExcelProperty(value = "分录ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
@ExcelDictFormat(readConverterExp = "主键")
|
||||
private Long entryId;
|
||||
|
||||
/**
|
||||
@@ -94,4 +94,11 @@ public class WmsJournalEntryVo {
|
||||
private String remark;
|
||||
|
||||
|
||||
public Long getEntryId() {
|
||||
return entryId;
|
||||
}
|
||||
|
||||
public void setEntryId(Long entryId) {
|
||||
this.entryId = entryId;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.klp.domain.WmsFinancialDocument;
|
||||
import com.klp.domain.vo.WmsFinancialDocumentVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 财务单据Mapper接口
|
||||
@@ -12,4 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
*/
|
||||
public interface WmsFinancialDocumentMapper extends BaseMapperPlus<WmsFinancialDocumentMapper, WmsFinancialDocument, WmsFinancialDocumentVo> {
|
||||
|
||||
Page<WmsFinancialDocumentVo> selectVoPageDetail(Page<Object> build,@Param("ew") LambdaQueryWrapper<WmsFinancialDocument> lqw);
|
||||
}
|
||||
|
||||
@@ -46,4 +46,6 @@ public interface IWmsFinancialDocumentService {
|
||||
* 校验并批量删除财务单据信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
TableDataInfo<WmsFinancialDocumentVo> queryPageListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery);
|
||||
}
|
||||
|
||||
@@ -48,7 +48,15 @@ public class WmsFinancialDocumentServiceImpl implements IWmsFinancialDocumentSer
|
||||
Page<WmsFinancialDocumentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询财务单据列表携带明细
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsFinancialDocumentVo> queryPageListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsFinancialDocument> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsFinancialDocumentVo> result = baseMapper.selectVoPageDetail(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
/**
|
||||
* 查询财务单据列表
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user