From e8b6397294a13285c3d679de91748256c55892f1 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 8 Apr 2025 14:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=97=B6=E8=B5=8B=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=8D=95=E6=8D=AE=E7=A9=BA?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     | 24 +++++++++----------
 .../api/service/inout/IoSplitCodeService.java |  3 ++-
 2 files changed, 13 insertions(+), 14 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 b6415e5a0..2b95e0c05 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -410,24 +410,23 @@ public class IoCollectOrderController extends BaseController {
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
         List<String> billNos = new ArrayList<>();
+        if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单号不能为空！");
+        IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderRequest.getBillNo());
+        if (StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
+            billNos = collectOrderService.getBillBySummary(collectOrder.getSummaryNo());
+        } else {
+            billNos.add(collectOrderRequest.getBillNo());
+        }
+        boolean isAllTag = true;
+
         if (!IntUtil.value(collectOrderRequest.getConfirmFinish())) {
             //1.校验是否全部自动赋码
             CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
             collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
-
-            IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderRequest.getBillNo());
-            if (StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
-//                collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo());
-                billNos = collectOrderService.getBillBySummary(collectOrder.getSummaryNo());
-            } else {
-                billNos.add(collectOrderRequest.getBillNo());
-            }
-            boolean isAllTag = true;
             String msg = "";
             for (String billNo : billNos) {
                 collectOrderBizRequest.setOrderIdFk(billNo);
                 List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
-
                 if (CollUtil.isNotEmpty(collectOrderBizResponses)) {
                     for (int i = 0; i < collectOrderBizResponses.size(); i++) {
                         CollectOrderBizResponse collectOrderBizResponse = collectOrderBizResponses.get(i);
@@ -445,13 +444,12 @@ public class IoCollectOrderController extends BaseController {
                 return ResultVOUtils.error(502, "该业务单据未全部赋码【" + msg.replaceAll(";$", "") + "】,是否强制完成单据？");
             }
         }
-
         if (CollUtil.isNotEmpty(billNos)) {
             List<IoCollectOrder> collectOrders = collectOrderService.list(new LambdaQueryWrapper<IoCollectOrder>().in(IoCollectOrder::getBillNo, billNos));
             if (CollUtil.isNotEmpty(collectOrders)) {
-                for (IoCollectOrder collectOrder : collectOrders) {
+                for (IoCollectOrder temp : collectOrders) {
                     CollectOrderRequest tempRequest = new CollectOrderRequest();
-                    BeanUtils.copyProperties(collectOrder, tempRequest);
+                    BeanUtils.copyProperties(temp, tempRequest);
                     collectOrderService.finishOrder(tempRequest, getUser(), false);
                 }
             }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 1f6da564f..078f96d95 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -503,8 +503,9 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 remainder = unTagCount % IntUtil.value(udiRelevanceResponse.getBhxjsl());
                 if (remainder > 0) {
                     collectOrder.setTagStatus(6);  //拆零未赋码
+                    break;
                 }
-                break;
+
             }
         }
         collectOrderBackupService.updateByBillNo(collectOrder);