feat(crm): 订单项控制器添加分页功能并新增销售员和合同查询接口
- 将getCoilsByOrderId方法改为分页查询,返回TableDataInfo格式 - 新增getCoilsBySalesman接口,支持按销售员查询生产成果钢卷列表 - 新增getCoilsByContractIdPaginated接口,支持按合同ID分页查询生产成果 - 更新前端API调用适配分页参数传递 - 修改listOrderPackaging接口支持分页查询 - 更新相关Vue组件适配新的分页数据结构返回格式
This commit is contained in:
@@ -105,11 +105,12 @@ public class CrmOrderItemController extends BaseController {
|
||||
@PathVariable Long contractId) {
|
||||
return R.ok(iCrmOrderItemService.queryFinanceAndObjectionByContractId(contractId));
|
||||
}
|
||||
// 根据订单id查询发货单据中的配卷。
|
||||
// 根据订单id查询发货单据中的配卷(分页)。
|
||||
@GetMapping("/coils/order/{orderId}")
|
||||
public R<List<WmsMaterialCoilVo>> getCoilsByOrderId(@NotNull(message = "订单ID不能为空")
|
||||
@PathVariable Long orderId) {
|
||||
return R.ok(iCrmOrderItemService.queryCoilsByOrderId(orderId));
|
||||
public TableDataInfo<WmsMaterialCoilVo> getCoilsByOrderId(@NotNull(message = "订单ID不能为空")
|
||||
@PathVariable Long orderId,
|
||||
PageQuery pageQuery) {
|
||||
return iCrmOrderItemService.queryCoilsByOrderId(orderId, pageQuery);
|
||||
}
|
||||
|
||||
// 根据合同id查询发货单据中的配卷。
|
||||
@@ -132,4 +133,19 @@ public class CrmOrderItemController extends BaseController {
|
||||
@PathVariable String customerId) {
|
||||
return R.ok(iCrmOrderItemService.queryCoilsByCustomerId(customerId));
|
||||
}
|
||||
|
||||
// 根据销售员查询生产成果(钢卷列表),分页
|
||||
@GetMapping("/coils/bySalesman")
|
||||
public TableDataInfo<WmsMaterialCoilVo> getCoilsBySalesman(@RequestParam String salesman,
|
||||
PageQuery pageQuery) {
|
||||
return iCrmOrderItemService.queryCoilsBySalesman(salesman, pageQuery);
|
||||
}
|
||||
|
||||
// 根据合同ID查询生产成果(钢卷列表),分页
|
||||
@GetMapping("/coils/byContract/{contractId}")
|
||||
public TableDataInfo<WmsMaterialCoilVo> getCoilsByContractIdPaginated(@NotNull(message = "合同ID不能为空")
|
||||
@PathVariable Long contractId,
|
||||
PageQuery pageQuery) {
|
||||
return iCrmOrderItemService.queryCoilsByContractIdPaginated(contractId, pageQuery);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user