feat(crm): 订单项控制器添加分页功能并新增销售员和合同查询接口
- 将getCoilsByOrderId方法改为分页查询,返回TableDataInfo格式 - 新增getCoilsBySalesman接口,支持按销售员查询生产成果钢卷列表 - 新增getCoilsByContractIdPaginated接口,支持按合同ID分页查询生产成果 - 更新前端API调用适配分页参数传递 - 修改listOrderPackaging接口支持分页查询 - 更新相关Vue组件适配新的分页数据结构返回格式
This commit is contained in:
@@ -188,18 +188,19 @@ public class WmsDeliveryWaybillDetailController extends BaseController {
|
||||
|
||||
|
||||
/**
|
||||
* 根据负责人(principal)查询已发货绑定的钢卷列表
|
||||
* 根据负责人(principal)查询已发货绑定的钢卷列表(分页)
|
||||
*/
|
||||
@GetMapping("/coilListByPrincipal")
|
||||
public List<WmsMaterialCoilVo> coilListByPrincipal(
|
||||
@RequestParam(required = false) String principal) {
|
||||
public TableDataInfo<WmsMaterialCoilVo> coilListByPrincipal(
|
||||
@RequestParam(required = false) String principal,
|
||||
PageQuery pageQuery) {
|
||||
List<Long> boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIdsByPrincipal(principal);
|
||||
if (boundCoilIds == null || boundCoilIds.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
return new TableDataInfo<>();
|
||||
}
|
||||
WmsMaterialCoilBo wmsMaterialCoilBo = new WmsMaterialCoilBo();
|
||||
wmsMaterialCoilBo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
|
||||
return iWmsMaterialCoilService.queryList(wmsMaterialCoilBo);
|
||||
return iWmsMaterialCoilService.queryPageList(wmsMaterialCoilBo, pageQuery);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user