From 5e1d1e51e25d4fb5536f59b8a9ab1b0ba5e689bf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 20 Aug 2024 11:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     | 32 +++++++++++++++++++
 .../api/req/collect/CollectOrderRequest.java  |  5 +++
 .../res/collect/IoCollectOrderResponse.java   |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 01e905a7b..387bcdf54 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -80,6 +81,37 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.error(500, "未查到待处理单据");
     }
 
+
+    /**
+     * 获取当前正在处理的单据
+     *
+     * @param collectOrderRequest
+     * @return
+     */
+    @GetMapping("/udiwms/basic/collect/order/current")
+    public BaseResponse getCurrentOrder(CollectOrderRequest collectOrderRequest) {
+        if (collectOrderRequest.getWorkPlaceCode() == null) {
+            return ResultVOUtils.error(500, "工位不能为空！");
+        }
+        CollectOrderRequest request = new CollectOrderRequest();
+        request.setPage(1);
+        request.setLimit(1);
+        request.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+        request.setTagStatus(2);
+        List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
+        if (CollUtil.isNotEmpty(orderResponses))
+            return ResultVOUtils.success(orderResponses.get(0));
+        else {
+            request.setTagStatus(-1);
+            orderResponses = collectOrderService.filterList(request);
+            if (CollUtil.isNotEmpty(orderResponses))
+                return ResultVOUtils.success(orderResponses.get(0));
+        }
+
+        return ResultVOUtils.error(500, "未查到待处理单据");
+    }
+
+
     @GetMapping("/udiwms/basic/collect/order/detail")
     public BaseResponse detail(CollectOrderBizRequest collectOrderBizRequest) {
         if (StrUtil.isBlank(collectOrderBizRequest.getOrderIdFk())) {
diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
index 82f36416d..e14007f3e 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -90,5 +90,10 @@ public class CollectOrderRequest extends ListPageRequest {
 
     private Boolean forceFinish;
 
+    /**
+     * 是否确定获取当前正在处理单据
+     */
+    private Boolean confirmGet;
+
 
 }
diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
index e368caa10..183e7a565 100644
--- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
@@ -81,7 +81,7 @@ public class IoCollectOrderResponse {
     private String updateUser;
 
     /**
-     * 赋码状态  0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常
+     * 赋码状态  0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常,-1:草稿，挂起状态
      */
     private Integer tagStatus;
     private String tagMsg;