From d21c96facb43ba4efcc588da811eb996ea7ff654 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 19 Dec 2024 10:40:25 +0800
Subject: [PATCH] =?UTF-8?q?12/19=20=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 0dcb8feb9..b1bb8b254 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -407,6 +407,20 @@ public class IoCollectOrderController extends BaseController {
         collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
         return ResultVOUtils.success();
     }
+    @PostMapping("/udiwms/basic/collect/order/finishCheckOrder")
+    @Transactional(rollbackFor = Exception.class)
+    public BaseResponse finishCheckOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+        if (!IntUtil.value(collectOrderRequest.getConfirmFinish())) {
+            //1.校验是否全部自动赋码
+            CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
+            collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
+            List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
+            boolean isAllTag = collectOrderBizResponses.stream()
+                    .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
+        }
+        collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
+        return ResultVOUtils.success();
+    }
 
     @Resource
     IoSplitCodeService splitCodeService;