From 0ca395093d7d783197d8f848aea8bd5eae86b978 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期一, 20 十月 2025 10:43:15 +0800
Subject: [PATCH] 希日出库修改确认
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 753675a..428e523 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
@@ -814,9 +814,12 @@
nextDirection = lastDirection;
reverse = true;
} else {
- if (Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
- .equals(TaskPosDto.PosType.ORI_STA)) {
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.ORI_STA) || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && lastCode.getData().equals("00000050")) {
// turn
+ reverse = false;
+
actionList.add(new Action(
null, // 缂栧彿s
task.getBusId(), // 鎬荤嚎
@@ -1098,21 +1101,21 @@
// throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
// }
//
-//// actionList.add(new Action(
-//// null, // 缂栧彿
-//// task.getBusId(), // 鎬荤嚎
-//// task.getId(), // 浠诲姟
-//// null, // 鍔ㄤ綔鍙�
-//// null, // 浼樺厛绾�
-//// actionType.desc, // 鍚嶇О
-//// (double) agvSpeedType.val, // 灞炴�у��
-//// lastCode.getData(), // 鍦伴潰鐮�
-//// String.valueOf(gap.getDistance()), // 鍔ㄤ綔鍙傛暟
-//// actionType.val(), // 鍔ㄤ綔绫诲瀷
-//// actionPrepareSts, // 鍔ㄤ綔杩涘害
-//// agvId, // AGV
-//// now // 宸ヤ綔鏃堕棿
-//// ));
+// actionList.add(new Action(
+// null, // 缂栧彿
+// task.getBusId(), // 鎬荤嚎
+// task.getId(), // 浠诲姟
+// null, // 鍔ㄤ綔鍙�
+// null, // 浼樺厛绾�
+// actionType.desc, // 鍚嶇О
+// (double) agvSpeedType.val, // 灞炴�у��
+// lastCode.getData(), // 鍦伴潰鐮�
+// String.valueOf(gap.getDistance()), // 鍔ㄤ綔鍙傛暟
+// actionType.val(), // 鍔ㄤ綔绫诲瀷
+// actionPrepareSts, // 鍔ㄤ綔杩涘害
+// agvId, // AGV
+// now // 宸ヤ綔鏃堕棿
+// ));
// // turn
// actionList.add(new Action(
// null, // 缂栧彿
@@ -1157,11 +1160,11 @@
task.getId(), // 浠诲姟
null, // 鍔ㄤ綔鍙�
null, // 浼樺厛绾�
- ActionTypeType.ReadyReleaseToConveyorSta.desc, // 鍚嶇О
- staWorkDirection, // 灞炴�ш皰
+ ActionTypeType.ReadyReleaseToShelvesLoc.desc, // 鍚嶇О
+ Double.parseDouble("0"), // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
String.valueOf(destSta.getOffset()), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.ReadyReleaseToConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
+ ActionTypeType.ReadyReleaseToShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now, // 宸ヤ綔鏃堕棿
--
Gitblit v1.9.1