From 0c82ebffc32da463d16ae964dfdbdff41aad77aa Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Wed, 26 Nov 2025 07:58:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=91=E7=94=9F=E7=9A=84=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceImplements/WorkServiceImplements.java         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
index 240cc1a..3152a41 100644
--- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
+++ b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
@@ -782,9 +782,6 @@ public class WorkServiceImplements implements IWorkService {
             if (workFlowList.isEmpty()) {
                 return "没有已完成的工作流可以确认";
             }
-            // 保存，防止标签未打印
-            workFlowLastService.remove(new LambdaQueryWrapper<WorkFlowLast>().eq(WorkFlowLast::getWorkStation, workStation));
-            workFlowLastService.saveBatch(BeanUtil.copyToList(workFlowList, WorkFlowLast.class));
             // workSummary列表
             List<WorkSummary> workSummaryList = new ArrayList<>();
             List<KateOrders> needUpdateKateOrdersList = new ArrayList<>();
@@ -852,11 +849,15 @@ public class WorkServiceImplements implements IWorkService {
             }
 
             boolean doTransResult = dbTransUtils.useTran(() -> {
+                // 保存，防止标签未打印
+                workFlowLastService.remove(new LambdaQueryWrapper<WorkFlowLast>().eq(WorkFlowLast::getWorkStation, workStation));
+                workFlowLastService.saveOrUpdateBatch(BeanUtil.copyToList(workFlowList, WorkFlowLast.class));
+                // 保存总结
                 workSummaryService.saveOrUpdateBatch(workSummaryList);
                 // 先清空之前的
                 eLocationConfigLastService.remove(new LambdaQueryWrapper<ELocationConfigLast>()
                         .eq(ELocationConfigLast::getWorkStation, workStation));
-                eLocationConfigLastService.saveBatch(eLocationConfigLastList);
+                eLocationConfigLastService.saveOrUpdateBatch(eLocationConfigLastList);
                 // 删除所有的标签配置
                 eLocationConfigService.remove(new LambdaQueryWrapper<ELocationConfig>()
                         .eq(ELocationConfig::getWorkStation, workStation));