From a6436a464247b836d2c475210e2cf86924f6da58 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 12 Aug 2023 12:05:20 +0800
Subject: [PATCH] =?UTF-8?q?pda=E5=BE=85=E6=A0=A1=E9=AA=8C=E5=BE=85?=
 =?UTF-8?q?=E9=85=8D=E8=B4=A7=E7=AD=89=E5=8D=95=E6=8D=AE=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   | 42 +++++++++++++++++++
 .../api/res/inout/IoOrderPdaResponse.java     | 13 ++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/main/java/com/glxp/api/res/inout/IoOrderPdaResponse.java

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<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
+                return ResultVOUtils.page(pageInfo);
+            }
+        }
+        String customerId = getCustomerId();
+        if (!customerId.equals("110")) {
+            filterOrderRequest.setFromCorp(customerId);
+        }
+        List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
+        if (CollUtil.isEmpty(list))
+            return ResultVOUtils.error(500, "未查询到单据");
+        FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
+        filterOrderDetailBizRequest.setOrderIdFk(filterOrderRequest.getBillNo());
+        List<IoOrderDetailBizResponse> orderDetailBizResponses = orderDetailBizService.filterList(filterOrderDetailBizRequest);
+        IoOrderPdaResponse orderPdaResponse = new IoOrderPdaResponse();
+        orderPdaResponse.setOrderResponse(list.get(0));
+        orderPdaResponse.setOrderDetailBizResponses(orderDetailBizResponses);
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+
     public List<IoCodeTempEntity> getOtherCode(String billNo, List<IoCodeTempEntity> codeEntities) {
         List<IoOrderDetailBizEntity> 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<IoOrderDetailBizResponse> orderDetailBizResponses;
+
+}