|
|
|
@ -214,22 +214,15 @@ public class IoCollectOrderController extends BaseController {
|
|
|
|
|
return ResultVOUtils.error(500, "未找到单据");
|
|
|
|
|
}
|
|
|
|
|
//如果是 处理单据页面来的 有汇总单号 要走汇总单号
|
|
|
|
|
if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())){
|
|
|
|
|
if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
|
|
|
|
|
collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo());
|
|
|
|
|
List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
|
|
|
|
|
PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
|
|
|
|
|
PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(list);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}else {
|
|
|
|
|
List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
|
|
|
|
|
PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
|
|
|
|
|
PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(list);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
|
|
|
|
|
PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
|
|
|
|
|
PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(list);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|