From 91b99a6415151cc3d10bad683b7fa7d7fadfa837 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 28 三月 2025 10:21:19 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java |   73 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 2496c26..d75aff1 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -35,7 +35,7 @@
 import com.zy.acs.manager.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -47,7 +47,7 @@
  * Created by vincent on 2023/6/14
  */
 @Slf4j
-@Component("mainService")
+@Service("mainService")
 public class MainService {
 
     @Autowired
@@ -96,7 +96,6 @@
     private LaneService laneService;
     @Autowired
     private ActionSorter actionSorter;
-
 
     @SuppressWarnings("all")
     @Transactional
@@ -827,23 +826,24 @@
                         assert backpackType != null;
                         // 妫�楠屾柟鍚�
                         if (!lastDirection.equals(workDirection)) {
+                            throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
                             // turn
-                            actionList.add(new Action(
-                                    null,    // 缂栧彿
-                                    task.getBusId(),    // 鎬荤嚎
-                                    task.getId(),    // 浠诲姟
-                                    null,    // 鍔ㄤ綔鍙�
-                                    null,    // 浼樺厛绾�
-                                    ActionTypeType.TurnCorner.desc,    // 鍚嶇О
-                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 灞炴�у��
-                                    lastCode.getData(),    // 鍦伴潰鐮�
-                                    String.valueOf(workDirection),   // 鍔ㄤ綔鍙傛暟
-                                    ActionTypeType.TurnCorner.val(),    // 鍔ㄤ綔绫诲瀷
-                                    actionPrepareSts,    // 鍔ㄤ綔杩涘害
-                                    agvId,    // AGV
-                                    now    // 宸ヤ綔鏃堕棿
-                            ));
-                            lastDirection = workDirection;
+//                            actionList.add(new Action(
+//                                    null,    // 缂栧彿
+//                                    task.getBusId(),    // 鎬荤嚎
+//                                    task.getId(),    // 浠诲姟
+//                                    null,    // 鍔ㄤ綔鍙�
+//                                    null,    // 浼樺厛绾�
+//                                    ActionTypeType.TurnCorner.desc,    // 鍚嶇О
+//                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 灞炴�у��
+//                                    lastCode.getData(),    // 鍦伴潰鐮�
+//                                    String.valueOf(workDirection),   // 鍔ㄤ綔鍙傛暟
+//                                    ActionTypeType.TurnCorner.val(),    // 鍔ㄤ綔绫诲瀷
+//                                    actionPrepareSts,    // 鍔ㄤ綔杩涘害
+//                                    agvId,    // AGV
+//                                    now    // 宸ヤ綔鏃堕棿
+//                            ));
+//                            lastDirection = workDirection;
                         }
                         // 璐ф灦鍙栬揣
                         Loc oriLoc = locService.getById(task.getOriLoc());
@@ -885,23 +885,24 @@
                         assert backpackType != null;
                         // 妫�楠屾柟鍚�
                         if (!lastDirection.equals(workDirection)) {
-                            // turn
-                            actionList.add(new Action(
-                                    null,    // 缂栧彿
-                                    task.getBusId(),    // 鎬荤嚎
-                                    task.getId(),    // 浠诲姟
-                                    null,    // 鍔ㄤ綔鍙�
-                                    null,    // 浼樺厛绾�
-                                    ActionTypeType.TurnCorner.desc,    // 鍚嶇О
-                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 灞炴�у��
-                                    lastCode.getData(),    // 鍦伴潰鐮�
-                                    String.valueOf(workDirection),   // 鍔ㄤ綔鍙傛暟
-                                    ActionTypeType.TurnCorner.val(),    // 鍔ㄤ綔绫诲瀷
-                                    actionPrepareSts,    // 鍔ㄤ綔杩涘害
-                                    agvId,    // AGV
-                                    now    // 宸ヤ綔鏃堕棿
-                            ));
-                            lastDirection = workDirection;
+                            throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+//                            // turn
+//                            actionList.add(new Action(
+//                                    null,    // 缂栧彿
+//                                    task.getBusId(),    // 鎬荤嚎
+//                                    task.getId(),    // 浠诲姟
+//                                    null,    // 鍔ㄤ綔鍙�
+//                                    null,    // 浼樺厛绾�
+//                                    ActionTypeType.TurnCorner.desc,    // 鍚嶇О
+//                                    mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D,    // 灞炴�у��
+//                                    lastCode.getData(),    // 鍦伴潰鐮�
+//                                    String.valueOf(workDirection),   // 鍔ㄤ綔鍙傛暟
+//                                    ActionTypeType.TurnCorner.val(),    // 鍔ㄤ綔绫诲瀷
+//                                    actionPrepareSts,    // 鍔ㄤ綔杩涘害
+//                                    agvId,    // AGV
+//                                    now    // 宸ヤ綔鏃堕棿
+//                            ));
+//                            lastDirection = workDirection;
                         }
                         // 鏆傚瓨鐐瑰彇璐ц揣
                         actionList.add(new Action(

--
Gitblit v1.9.1