From 244c1f4d11fe1fd483d995c0d2b822e27ef1a19b Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 31 Mar 2025 20:56:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     | 19 ++++++++++++++++---
 .../inout/IoCodeTempController.java           | 10 ++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

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 62521e0a0..5832d9dcd 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -411,10 +411,23 @@ public class IoCollectOrderController extends BaseController {
             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);
+            boolean isAllTag = true;
+            String msg = "";
+            if (CollUtil.isNotEmpty(collectOrderBizResponses)){
+                for (int i = 0; i < collectOrderBizResponses.size(); i++) {
+                    CollectOrderBizResponse collectOrderBizResponse = collectOrderBizResponses.get(i);
+                    if ( !(StrUtil.isNotEmpty(collectOrderBizResponse.getFinishUdiCode()) || collectOrderBizResponse.getAutoTagStatus() == 2) ) {
+                        isAllTag = false;
+                        String cpmctymc = collectOrderBizResponse.getCpmctymc();
+                        Integer count = collectOrderBizResponse.getCount();
+                        Integer autoResCount = IntUtil.value(collectOrderBizResponse.getAutoResCount());
+                        msg = msg +" "+ cpmctymc + ":未采集数量" + (count - autoResCount) + ";";
+                    }
+                }
+            }
+
             if (!isAllTag) {
-                return ResultVOUtils.error(502, "该业务单据未全部赋码，是否强制完成单据？");
+                return ResultVOUtils.error(502, "该业务单据未全部赋码【" +  msg.replaceAll(";$", "") + "】,是否强制完成单据？");
             }
         }
         collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index a8b528523..ca5de41f7 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -282,7 +282,11 @@ public class IoCodeTempController extends BaseController {
                         }
                     }
                 }
-                BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据或单据存在未对照产品");
+                BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据");
+                response.setData(code);
+                return response;
+            }else {
+                BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage());
                 response.setData(code);
                 return response;
             }
@@ -293,9 +297,7 @@ public class IoCodeTempController extends BaseController {
             return response;
         }
 
-        BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据");
-        response.setData(collectOrder);
-        return response;
+
     }
 
     //前端扫码完整性校验