From d66bc1821a36fd9272292bfa9d9c0980359e9ae0 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 08 十二月 2025 08:44:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
index 375dd95..0c2d420 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -56,15 +56,7 @@
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
- // 鉁� 浜嬪姟鎻愪氦鍚庢墽琛�
- TransactionSynchronizationManager.registerSynchronization(
- new TransactionSynchronizationAdapter() {
- @Override
- public void afterCommit() {
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
- }
- }
- );
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 1:
LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
@@ -118,6 +110,7 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 2:
List<LocDetl> locDetls2 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", basAgvMast.getLocNo()));
@@ -201,10 +194,12 @@
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 3:
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
default:
return FAIL.setMsg("鏆備笉鏀寔璇ョ被鍨�");
--
Gitblit v1.9.1