From b42b4d272a465c738d65f066017df12af4958c3c Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 14 Sep 2024 14:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8D=95=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/collect/IoCollectOrderController.java    | 3 +++
 .../api/service/collect/IoCollectOrderCodeManService.java   | 6 +++---
 2 files changed, 6 insertions(+), 3 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 bc97ddd78..ca71971bf 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -327,6 +327,9 @@ public class IoCollectOrderController extends BaseController {
                 collectOrderBiz.setScanActCount(0);
                 collectOrderBiz.setTempSplitCount(0);
                 collectOrderBiz.setTempWorkPlaceCount(0);
+                if (collectOrderBiz.getCount() == 0) {
+                    collectOrderBizService.removeById(collectOrderBiz.getId());
+                }
             }
             collectOrderBizService.updateBatchById(collectOrderBizs);
         }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index 8db24aab5..d273e5517 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -216,7 +216,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 case 3: //提醒是否插入
                     if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
                         if (collectOrderBiz == null)
-                            throw new JsonException(502, "非此单据追溯码，是否继续添加！");
+                            throw new JsonException(502, addTagCodeReqeust.getCode() + "非此单据追溯码，是否继续添加！");
                         int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
                         int actCount1 = 0;
                         if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {
@@ -231,7 +231,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                                     throw new JsonException(502, collectOrderBiz.getCpmctymc() + "拆零数量还有剩余，是否继续扫码？");
                                 }
                             }
-                            throw new JsonException(502, "扫码数量超出，是否继续添加！");
+                            throw new JsonException(502, collectOrderBiz.getCpmctymc() +"扫码数量超出，是否继续添加！");
                         }
                         collectOrderBiz.setScanCount(count1);
                         collectOrderBiz.setScanActCount(actCount1);
@@ -301,7 +301,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
 
                     if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
                         if (collectOrderBiz == null)
-                            throw new JsonException(502, "非此单据追溯码，是否继续添加？");
+                            throw new JsonException(502, addTagCodeReqeust.getCode() + "非此单据追溯码，是否继续添加？");
                         int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
                         int actCount1 = 0;
                         if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {