From 6577403b7d7aa71c55a8df80721ddfd2a82a6015 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 06 十二月 2025 15:08:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 afc903f..0c2d420 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -10,6 +10,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
import java.util.ArrayList;
import java.util.Date;
@@ -29,6 +31,8 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private OpenService openService;
public ReturnT<String> start(BasAgvMast basAgvMast) {
@@ -52,6 +56,7 @@
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 1:
LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
@@ -105,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()));
@@ -114,8 +120,12 @@
LocMast locMast2 = locMastService.selectById(basAgvMast.getLocNo());
// 淇敼搴撲綅鐘舵�� S ====>> F
- if (locMast2.getLocSts().equals("S")) {
+ if (locMast2.getLocSts().equals("S") ) {
locMast2.setLocSts("F");
+ locMast2.setIoTime(now);
+ locMast2.setModiTime(now);
+ } else if(basAgvMast.getTaskNo()>10000){
+ locMast2.setLocSts("D");
locMast2.setIoTime(now);
locMast2.setModiTime(now);
} else {
@@ -184,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