diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 58f06959d..13f35bd0b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -517,6 +517,48 @@ public class IoOrderController extends BaseController { } + /** + * PDA获取待校验、待配货等单据 + * + * @param filterOrderRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/order/pda/download") + public BaseResponse pdaFilterOrder(FilterOrderRequest filterOrderRequest) { + + if (StrUtil.isEmpty(filterOrderRequest.getBillNo())) { + return ResultVOUtils.error(500, "单据号不能为空!"); + } + if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { + orderService.setFilterStatus(filterOrderRequest); + } + if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { + orderService.setActions(filterOrderRequest); + //要是不存在要查询的单据类型就直接放回空 + if (CollUtil.isEmpty(filterOrderRequest.getActions())) { + PageInfo pageInfo = new PageInfo<>(new ArrayList<>()); + return ResultVOUtils.page(pageInfo); + } + } + String customerId = getCustomerId(); + if (!customerId.equals("110")) { + filterOrderRequest.setFromCorp(customerId); + } + List list = orderService.filterList(filterOrderRequest); + if (CollUtil.isEmpty(list)) + return ResultVOUtils.error(500, "未查询到单据"); + FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); + filterOrderDetailBizRequest.setOrderIdFk(filterOrderRequest.getBillNo()); + List orderDetailBizResponses = orderDetailBizService.filterList(filterOrderDetailBizRequest); + IoOrderPdaResponse orderPdaResponse = new IoOrderPdaResponse(); + orderPdaResponse.setOrderResponse(list.get(0)); + orderPdaResponse.setOrderDetailBizResponses(orderDetailBizResponses); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + public List getOtherCode(String billNo, List codeEntities) { List orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderPdaResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderPdaResponse.java new file mode 100644 index 000000000..38fadad4a --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoOrderPdaResponse.java @@ -0,0 +1,13 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +import java.util.List; + +@Data +public class IoOrderPdaResponse { + + private IoOrderResponse orderResponse; + private List orderDetailBizResponses; + +}