|
|
|
@ -97,6 +97,31 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
return ResultVOUtils.page(pageInfo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/inout/preInorder/filter")
|
|
|
|
|
public BaseResponse filterPreInorder(FilterOrderRequest filterOrderRequest) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
|
|
|
|
|
orderService.setFilterStatus(filterOrderRequest);
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
|
|
|
|
|
orderService.setActions(filterOrderRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
|
|
|
|
|
orderService.setInvoiceFiltes(filterOrderRequest);
|
|
|
|
|
}
|
|
|
|
|
String customerId = getCustomerId();
|
|
|
|
|
if (!customerId.equals("110")) {
|
|
|
|
|
filterOrderRequest.setFromCorp(customerId);
|
|
|
|
|
}
|
|
|
|
|
List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
|
|
|
|
|
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
|
|
|
|
|
return ResultVOUtils.page(pageInfo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("/udiwms/inout/order/filterInvoice")
|
|
|
|
|
public BaseResponse filterInvoice(FilterOrderRequest filterOrderRequest) {
|
|
|
|
|
filterOrderRequest.setDealStatuses(Arrays.asList(2, 3));
|
|
|
|
|