From 97e0bddd5a8b54ba0007af1f70d3e910a4dd81c0 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期二, 06 一月 2026 19:44:07 +0800
Subject: [PATCH] 测试修馥版
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 865 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 516 insertions(+), 349 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 1ea8950..b717ce4 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
@@ -18,6 +18,7 @@
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.R;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.domain.TaskDto;
@@ -28,10 +29,12 @@
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.utils.HttpHandler;
+import com.zy.acs.manager.manager.controller.param.LocSiteParams;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
+import com.zy.acs.manager.manager.service.impl.LocStsServiceImpl;
import com.zy.acs.manager.manager.service.impl.WebsocketServiceImpl;
import com.zy.acs.manager.manager.utils.ActionSorter;
import com.zy.acs.manager.system.service.ConfigService;
@@ -104,6 +107,8 @@
private TaskReportService taskReportService;
@Autowired
private AgvDurationService agvDurationService;
+ @Autowired
+ private LocStsService locStsService;
@SuppressWarnings("all")
@Transactional
@@ -138,7 +143,6 @@
}
Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, true);
Integer locStaTaskNum = configService.getVal("LOC_STA_TASK_NUM", Integer.class, 2);
-
// 淇濆瓨浠诲姟
for (Task task : taskList) {
@@ -205,11 +209,11 @@
break;
case STA_TO_LOC:
oriSta = staService.getById(task.getOriSta());
- if (oriSta.getStaTypeIsCheck() != 1) {
- if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
- throw new BusinessException("oriSta锛�" + task.getOriSta$() + " is not in STOCK status");
- }
- }
+// if (oriSta.getStaTypeIsCheck() != 1) {
+// if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
+// throw new BusinessException("oriSta锛�" + task.getOriSta$() + " is not in STOCK status");
+// }
+// }
oriSta.setStaSts(StaStsType.READY_TAKE.val());
oriSta.setUpdateTime(now);
if (!staService.updateById(oriSta)) {
@@ -761,35 +765,42 @@
boolean first = true;
for (Segment segment : segmentList) {
-
// 鍒嗘鎵�灞炵殑Task
Task task = taskService.getById(segment.getTaskId());
-
+ TaskPosDto.PosType posType = Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()));
+ // 鐩爣鏄惁涓虹珯鐐�
+ boolean isStation = posType == TaskPosDto.PosType.ORI_STA || posType == TaskPosDto.PosType.DEST_STA;
+ // 鐩爣鏄惁涓哄簱浣�
+ boolean isLoc = posType == TaskPosDto.PosType.ORI_LOC || posType == TaskPosDto.PosType.DEST_LOC;
+ // 绔欑偣鍦扮爜
+ List<String> turnCodes = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054");
+ // 搴撲綅鍦扮爜
+ List<String> locTurnCodes = Arrays.asList("00000080", "00000081", "00000082", "00000083", "00000084");
// 鑺傜偣鏉＄爜
Code code = codeService.getCacheById(segment.getEndNode());
// 闇�瑕佽蛋琛�
if (!lastCode.getData().equals(code.getData())) {
-
// 璧拌璺緞鑺傜偣
// List<String> pathList = mapService.checkoutPath(agv.getUuid(), lastCode, code);
List<String> pathListPart = pathList.subList(pathList.indexOf(lastCode.getData()), pathList.indexOf(code.getData()) + 1);
-
for (int i = 0; i < pathListPart.size(); i++) {
if (i == 0) {
continue;
}
-
String next = pathListPart.get(i);
-
Code nextCode = codeService.getCacheByData(next);
Double nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
-
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
boolean reverse = false;
if (nextDirection.equals((workDirection + 180) % 360)) {
- nextDirection = workDirection;
- reverse = true;
+ if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && locTurnCodes.contains(lastCode.getData()))) {
+ reverse = false;
+ lastDirection = nextDirection;
+ } else {
+ nextDirection = workDirection;
+ reverse = true;
+ }
}
// 绗簩姝ワ細鍒ゆ柇褰撳墠鑺傜偣鏄惁鍙互鏃嬭浆
@@ -810,7 +821,65 @@
nextDirection = lastDirection;
reverse = true;
} else {
+ if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
+ // turn
+ reverse = false;
+ actionList.add(new Action(
+ null, // 缂栧彿s
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(180), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ log.info("1TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
+ posType,
+ lastCode.getData(),
+ lastCode.getCornerBool(),
+ nextDirection,
+ 180);
+ } else {
+ Double turnDirection = nextDirection;
+ if (turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050") || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
+ turnDirection = 180.0;
+ reverse = false;
+ }
+ // turn
+ actionList.add(new Action(
+ null, // 缂栧彿s
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(turnDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ log.info("2TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
+ posType,
+ lastCode.getData(),
+ lastCode.getCornerBool(),
+ nextDirection,
+ nextDirection);
+ }
+ lastDirection = nextDirection;
+ }
+ } else {
+ if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
// turn
+ reverse = false;
actionList.add(new Action(
null, // 缂栧彿s
task.getBusId(), // 鎬荤嚎
@@ -820,20 +889,25 @@
ActionTypeType.TurnCorner.desc, // 鍚嶇О
mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(nextDirection), // 鍔ㄤ綔鍙傛暟
+ String.valueOf(180), // 鍔ㄤ綔鍙傛暟
ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now // 宸ヤ綔鏃堕棿
));
- lastDirection = nextDirection;
+ log.info("3TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
+ posType,
+ lastCode.getData(),
+ lastCode.getCornerBool(),
+ nextDirection,
+ 180);
}
}
}
// 绗竴涓姩浣滀竴瀹氭槸 turn
- if (actionList.isEmpty()) {
+ if (actionList.isEmpty() && lastCode.getCornerBool()) {
// turn
actionList.add(new Action(
null, // 缂栧彿
@@ -850,6 +924,12 @@
agvId, // AGV
now // 宸ヤ綔鏃堕棿
));
+ log.info("4TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
+ posType,
+ lastCode.getData(),
+ lastCode.getCornerBool(),
+ nextDirection,
+ nextDirection);
lastDirection = nextDirection;
}
@@ -879,31 +959,49 @@
lastCode = nextCode;
}
-
}
// 鍒濆鏂瑰悜鍊艰ˉ涓�
if (first) {
if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
- // 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;
-
+ Double turnDirection = workDirection;
+ Code nextCode = null;
+ //娣诲姞鍒ゆ柇鏄惁瀛樺湪涓嬩竴涓湴鐮�
+ int index = pathList.indexOf(lastCode.getData());
+ if (index != -1 && index + 1 < pathList.size()) {
+ String nextCodeData = pathList.get(index + 1);
+ nextCode = codeService.getCacheByData(nextCodeData);
+ } else {
+ nextCode = codeService.getCacheByData(lastCode.getData());
+ }
+ if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
+ turnDirection = workDirection + 180.0;
+ }
+ if (lastCode.getCornerBool()) {
+ // 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(turnDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ log.info("5TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
+ posType,
+ lastCode.getData(),
+ lastCode.getCornerBool(),
+ null,
+ turnDirection);
+ lastDirection = workDirection;
+ }
}
first = false;
}
@@ -917,7 +1015,8 @@
assert backpackType != null;
// 妫�楠屾柟鍚�
if (!lastDirection.equals(workDirection)) {
- throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+ lastDirection = workDirection;
+// throw new CoolException(agvNo agvNo+ "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
}
// 璐ф灦鍙栬揣
Loc oriLoc = locService.getById(task.getOriLoc());
@@ -959,7 +1058,8 @@
assert backpackType != null;
// 妫�楠屾柟鍚�
if (!lastDirection.equals(workDirection)) {
- throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+ lastDirection = workDirection;
+// throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
}
// 鏆傚瓨鐐瑰彇璐ц揣
actionList.add(new Action(
@@ -1003,28 +1103,28 @@
Sta oriSta = staService.getById(task.getOriSta());
Double oriStaWorkDirection = mapService.getStaAngle(oriSta, workDirection);
// 妫�楠屾柟鍚�
- if (!lastDirection.equals(oriStaWorkDirection)) {
- if (!lastCode.getCornerBool()) {
- 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(oriStaWorkDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
- ));
- lastDirection = oriStaWorkDirection;
- }
+// if (!lastDirection.equals(oriStaWorkDirection)) {
+// if (!lastCode.getCornerBool()) {
+// 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(oriStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+// ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+// actionPrepareSts, // 鍔ㄤ綔杩涘害
+// agvId, // AGV
+// now // 宸ヤ綔鏃堕棿
+// ));
+// lastDirection = oriStaWorkDirection;
+// }
// 璁＄畻璐у弶宸ヤ綔鏂瑰悜
staWorkDirection = mapService.calculateAgvWorkDirectionByStation(oriStaWorkDirection, lastDirection);
actionList.add(new Action(
@@ -1033,11 +1133,11 @@
task.getId(), // 浠诲姟
null, // 鍔ㄤ綔鍙�
null, // 浼樺厛绾�
- ActionTypeType.ReadyTakeFromConveyorSta.desc, // 鍚嶇О
- staWorkDirection, // 灞炴�у��
+ ActionTypeType.ReadyTakeFromShelvesLoc.desc, // 鍚嶇О
+ Double.parseDouble("0"), // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
String.valueOf(oriSta.getOffset()), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.ReadyTakeFromConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
+ ActionTypeType.ReadyTakeFromShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now, // 宸ヤ綔鏃堕棿
@@ -1066,29 +1166,47 @@
// 绔欑偣鏀捐揣
Sta destSta = staService.getById(task.getDestSta());
Double destStaWorkDirection = mapService.getStaAngle(destSta, workDirection);
+// CodeGap gap = codeGapService.findByCodeOfBoth(lastCode.getId(), nextCode.getId());
+
// 妫�楠屾柟鍚�
- if (!lastDirection.equals(destStaWorkDirection)) {
- if (!lastCode.getCornerBool()) {
- 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(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
- ));
- lastDirection = destStaWorkDirection;
- }
+// if (!lastDirection.equals(destStaWorkDirection)) {
+// if (!lastCode.getCornerBool()) {
+// 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 // 宸ヤ綔鏃堕棿
+// ));
+// // 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(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+// ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+// actionPrepareSts, // 鍔ㄤ綔杩涘害
+// agvId, // AGV
+// now // 宸ヤ綔鏃堕棿
+// ));
+// lastDirection = destStaWorkDirection;
+// }
// 鏆傚瓨鐐瑰彇璐�
assert backpackType != null;
actionList.add(new Action(
@@ -1115,11 +1233,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, // 宸ヤ綔鏃堕棿
@@ -1131,7 +1249,7 @@
// 妫�楠屾柟鍚�
FuncSta chargeFuncSta = funcStaService.query(lastCode.getId(), FuncStaType.CHARGE.toString());
Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
- if (!lastDirection.equals(chargeDirection)) {
+ if (!lastDirection.equals(chargeDirection) && lastCode.getCornerBool()) {
actionList.add(new Action(
null, // 缂栧彿
null, // 鎬荤嚎
@@ -1287,25 +1405,25 @@
}
}
-
-
/**
* 鏍规嵁鍒嗙墖鐢熸垚鍔ㄤ綔 ( 杞﹁締鍙兘宸茬粡鍋氳繃涓�浜涗换鍔′簡,姝ｅ湪绛夊緟涓嬩竴娈典换鍔� )
*/
@Transactional
- public synchronized void generateActionV2(Long agvId, List<Segment> segmentList, List<String> pathList, Date algoStartTime) {
+ public synchronized void generateActionV2(Long agvId, List<Segment> segmentList, List<String> pathList,
+ Date algoStartTime) {
try {
if (Cools.isEmpty(agvId, segmentList)) {
return;
}
Date now = new Date();
long actionPrepareSts = ActionStsType.PREPARE.val();
-// JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class);
+ // JSONObject storeDirection = configService.getVal("storeDirection",
+ // JSONObject.class);
int angleOffsetVal = configService.getVal("mapAngleOffsetVal", Integer.class);
String agvNo = agvService.getAgvNo(agvId);
-// if (!agvService.judgeEnable(agvId)) {
-// throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�...");
-// }
+ // if (!agvService.judgeEnable(agvId)) {
+ // throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�...");
+ // }
AgvModel agvModel = agvModelService.getByAgvId(agvId);
Double workDirection = agvModel.getWorkDirection();
@@ -1322,11 +1440,14 @@
throw new CoolException("AGV[" + agvNo + "]瀹氫綅鍋忕Щ...");
}
- String lastCorner = null;
- for (int i = pathList.size(); i <0; i++) {
- Code nextCode = codeService.getCacheByData(pathList.get(i - 1));
- if (nextCode!=null&&nextCode.getCornerBool()){
- lastCorner =pathList.get(i - 1);
+ //String lastCorner = null;
+ Integer index = -1;
+ boolean corner = false;
+ for (int i = pathList.size(); i < 0; i++) {
+ Code nextCode = codeService.getCacheByData(pathList.get(i));
+ if (nextCode != null && nextCode.getCornerBool()) {
+ //lastCorner = pathList.get(i);
+ index = i;
}
}
@@ -1350,19 +1471,21 @@
if (i == 0) {
continue;
}
-
String next = pathListPart.get(i);
-
Code nextCode = codeService.getCacheByData(next);
- Double nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
+ Double nextDirection;
boolean reverse = false;
- if (lastCorner.equals(lastCode)){
- // DOTO
+ if (index >= i) {
+ // DOTO 娣诲姞杞集
+ Code endCode = codeService.getCacheByData(pathList.get(pathList.size() - 1));
+ nextDirection = mapService.calculateDirection(lastCode, endCode, angleOffsetVal);
+ reverse = true;
+ } else {
+ nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
- }else {
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
- if (nextDirection.equals((workDirection + 180) % 360)) {
+ if (!nextDirection.equals((workDirection + 180) % 360)) {
nextDirection = workDirection;
reverse = true;
}
@@ -1408,24 +1531,23 @@
}
}
-
// 绗竴涓姩浣滀竴瀹氭槸 turn
if (actionList.isEmpty()) {
// 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(nextDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(nextDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
lastDirection = nextDirection;
@@ -1438,19 +1560,19 @@
}
CodeGap gap = codeGapService.findByCodeOfBoth(lastCode.getId(), nextCode.getId());
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 // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ actionType.desc, // 鍚嶇О
+ (double) agvSpeedType.val, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(gap.getDistance()), // 鍔ㄤ綔鍙傛暟
+ actionType.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
lastCode = nextCode;
@@ -1461,22 +1583,23 @@
// 鍒濆鏂瑰悜鍊艰ˉ涓�
if (first) {
- if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
+ if (Cools.isEmpty(actionList)
+ || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
// 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 // 宸ヤ綔鏃堕棿
+ 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;
@@ -1650,121 +1773,121 @@
}
// 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(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
lastDirection = destStaWorkDirection;
}
// 鏆傚瓨鐐瑰彇璐�
assert backpackType != null;
actionList.add(new Action(
- null, // 缂栧彿
- task.getBusId(), // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.ReadyTakeFromAgvSite.desc, // 鍚嶇О
- (double) backpackType.lev, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(backpackType.height), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.ReadyTakeFromAgvSite.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyTakeFromAgvSite.desc, // 鍚嶇О
+ (double) backpackType.lev, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(backpackType.height), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyTakeFromAgvSite.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
// 璁＄畻璐у弶宸ヤ綔鏂瑰悜
- staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection, lastDirection);
+ staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection,
+ lastDirection);
actionList.add(new Action(
- null, // 缂栧彿
- task.getBusId(), // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.ReadyReleaseToConveyorSta.desc, // 鍚嶇О
- staWorkDirection, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(destSta.getOffset()), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.ReadyReleaseToConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now, // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyReleaseToConveyorSta.desc, // 鍚嶇О
+ staWorkDirection, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(destSta.getOffset()), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyReleaseToConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now, // 宸ヤ綔鏃堕棿
destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
- destSta.getStaNo()
- ));
+ destSta.getStaNo()));
break;
case TO_CHARGE:
// 妫�楠屾柟鍚�
FuncSta chargeFuncSta = funcStaService.query(lastCode.getId(), FuncStaType.CHARGE.toString());
Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
- if (!lastDirection.equals(chargeDirection)) {
+ if (!lastDirection.equals(chargeDirection) && lastCode.getCornerBool()) {
actionList.add(new Action(
- null, // 缂栧彿
- null, // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.TurnCorner.desc, // 鍚嶇О
- mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(chargeDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ null, // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(chargeDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
lastDirection = chargeDirection;
}
// charge
actionList.add(new Action(
- null, // 缂栧彿
- null, // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.DockingCharge.desc, // 鍚嶇О
- null, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- null, // 鍔ㄤ綔鍙傛暟
- ActionTypeType.DockingCharge.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ null, // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.DockingCharge.desc, // 鍚嶇О
+ null, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ null, // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.DockingCharge.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
break;
case TO_STANDBY:
-// FuncSta standByFuncSta = funcStaService.query(agvId, lastCode.getId(), 2);
-// Double standByDirection = Double.parseDouble(standByFuncSta.getAngle());
-// if (!lastDirection.equals(standByDirection)) {
-// actionList.add(new Action(
-// null, // 缂栧彿
-// null, // 鎬荤嚎
-// task.getId(), // 浠诲姟
-// null, // 鍔ㄤ綔鍙�
-// null, // 浼樺厛绾�
-// ActionTypeType.TurnCorner.desc, // 鍚嶇О
-// null, // 灞炴�ш皰
-// lastCode.getData(), // 鍦伴潰鐮�
-// String.valueOf(standByDirection), // 鍔ㄤ綔鍙傛暟
-// ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
-// actionPrepareSts, // 鍔ㄤ綔杩涘害
-// agvId, // AGV
-// now // 宸ヤ綔鏃堕棿
-// ));
-// lastDirection = standByDirection;
-// }
+ // FuncSta standByFuncSta = funcStaService.query(agvId, lastCode.getId(), 2);
+ // Double standByDirection = Double.parseDouble(standByFuncSta.getAngle());
+ // if (!lastDirection.equals(standByDirection)) {
+ // actionList.add(new Action(
+ // null, // 缂栧彿
+ // null, // 鎬荤嚎
+ // task.getId(), // 浠诲姟
+ // null, // 鍔ㄤ綔鍙�
+ // null, // 浼樺厛绾�
+ // ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ // null, // 灞炴�ш皰
+ // lastCode.getData(), // 鍦伴潰鐮�
+ // String.valueOf(standByDirection), // 鍔ㄤ綔鍙傛暟
+ // ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ // actionPrepareSts, // 鍔ㄤ綔杩涘害
+ // agvId, // AGV
+ // now // 宸ヤ綔鏃堕棿
+ // ));
+ // lastDirection = standByDirection;
+ // }
String runToWaitHeightFlag = configService.getVal("RunToWaitHeightFlag", String.class);
if (!Cools.isEmpty(runToWaitHeightFlag) && runToWaitHeightFlag.contains(agvId.toString())) {
String runToWaitHeight = configService.getVal("RunToWaitHeight", String.class);
@@ -1780,19 +1903,19 @@
throw new BusinessException("AGV瀹氫綅淇℃伅寮傚父锛屾棤娉曠敓鎴愬緟鏈哄姩浣�");
}
actionList.add(new Action(
- null, // 缂栧彿
- task.getBusId(), // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.RunToWaitHeight.desc, // 鍚嶇О
- runToWaitHeightValue, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- runToWaitHeight, // 鍔ㄤ綔鍙傛暟
- ActionTypeType.RunToWaitHeight.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.RunToWaitHeight.desc, // 鍚嶇О
+ runToWaitHeightValue, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ runToWaitHeight, // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.RunToWaitHeight.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
));
}
break;
@@ -1851,7 +1974,7 @@
log.info("{}鍙稟gv鍔ㄤ綔缁勮瀹屾垚锛屾寚浠ゆ暟閲忥細{}", agvNo, newActionList.size());
} catch (Exception e) {
- log.error("mainService.generateAction", e);
+ log.error("mainService.generateActionV2", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
if (!Cools.isEmpty(pathList)) {
@@ -1860,7 +1983,7 @@
mapDataDispatcher.clearDynamicMatrixByCodeList(null, codeMatrixIdxList);
}
- throw new RuntimeException("generateAction method caught an exception, rolling back transaction.", e);
+ throw new RuntimeException("generateActionV2 method caught an exception, rolling back transaction.", e);
}
}
@@ -2050,98 +2173,108 @@
if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_SHELVES_COMPLETE)) {
WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
-// if (null == loc) {
-// log.warn("Agv [{}] 涓婃姤寰�璐ф灦鏀捐揣瀹屾垚鏃讹紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(), agv_11_up.getLocCode());
-// } else {
-// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
-// for (Long taskId : taskIds) {
-// Task task = taskService.getById(taskId);
-// if (task.getDestLoc().equals(loc.getId())) {
-//
-// Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
-// .eq(Action::getTaskId, task.getId())
-// .eq(Action::getActionType, ActionTypeType.ReadyReleaseToShelvesLoc.val())
-// .eq(Action::getActionSts, ActionStsType.ISSUED.val())
-// );
-//
-// if (null != action) {
-// action.setActionSts(ActionStsType.FINISH.val());
-// action.setEndTime(now);
-// action.setUpdateTime(now);
-// if (!actionService.updateById(action)) {
-// log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
-// }
-// }
-// //鎻掑叆涓�鏉�
-// report(task, TaskReportStsType.END);
-// }
-// }
-// }
+ // Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode,
+ // String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
+ // if (null == loc) {
+ // log.warn("Agv [{}] 涓婃姤寰�璐ф灦鏀捐揣瀹屾垚鏃讹紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(),
+ // agv_11_up.getLocCode());
+ // } else {
+ // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ // for (Long taskId : taskIds) {
+ // Task task = taskService.getById(taskId);
+ // if (task.getDestLoc().equals(loc.getId())) {
+ //
+ // Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
+ // .eq(Action::getTaskId, task.getId())
+ // .eq(Action::getActionType, ActionTypeType.ReadyReleaseToShelvesLoc.val())
+ // .eq(Action::getActionSts, ActionStsType.ISSUED.val())
+ // );
+ //
+ // if (null != action) {
+ // action.setActionSts(ActionStsType.FINISH.val());
+ // action.setEndTime(now);
+ // action.setUpdateTime(now);
+ // if (!actionService.updateById(action)) {
+ // log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " +
+ // action.getName());
+ // }
+ // }
+ // //鎻掑叆涓�鏉�
+ // report(task, TaskReportStsType.END);
+ // }
+ // }
+ // }
-// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
-// for (Long taskId : taskIds) {
-// Task task = taskService.getById(taskId);
-// report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
-// }
+ // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ // for (Long taskId : taskIds) {
+ // Task task = taskService.getById(taskId);
+ // report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
+ // }
}
// 鍑哄簱鍙栬揣
if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_SHELVES_COMPLETE)) {
WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
-// if (null == loc) {
-// log.warn("Agv [{}] 涓婃姤浠庤揣鏋跺彇璐у畬鎴愶紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(), agv_11_up.getLocCode());
-// } else {
-//
-// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
-// for (Long taskId : taskIds) {
-// Task task = taskService.getById(taskId);
-// if (task.getOriLoc().equals(loc.getId())) {
-//
-// Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
-// .eq(Action::getTaskId, task.getId())
-// .eq(Action::getActionType, ActionTypeType.ReadyTakeFromShelvesLoc.val())
-// .eq(Action::getActionSts, ActionStsType.ISSUED.val())
-// );
-// if (null != action) {
-// action.setActionSts(ActionStsType.FINISH.val());
-// action.setEndTime(now);
-// action.setUpdateTime(now);
-// if (!actionService.updateById(action)) {
-// log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
-// }
-// }
-// report(task, TaskReportStsType.OTBIN);
-// }
-// }
-// }
-// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
-// for (Long taskId : taskIds) {
-// Task task = taskService.getById(taskId);
-// report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
-// }
+ // Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode,
+ // String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
+ // if (null == loc) {
+ // log.warn("Agv [{}] 涓婃姤浠庤揣鏋跺彇璐у畬鎴愶紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(),
+ // agv_11_up.getLocCode());
+ // } else {
+ //
+ // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ // for (Long taskId : taskIds) {
+ // Task task = taskService.getById(taskId);
+ // if (task.getOriLoc().equals(loc.getId())) {
+ //
+ // Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
+ // .eq(Action::getTaskId, task.getId())
+ // .eq(Action::getActionType, ActionTypeType.ReadyTakeFromShelvesLoc.val())
+ // .eq(Action::getActionSts, ActionStsType.ISSUED.val())
+ // );
+ // if (null != action) {
+ // action.setActionSts(ActionStsType.FINISH.val());
+ // action.setEndTime(now);
+ // action.setUpdateTime(now);
+ // if (!actionService.updateById(action)) {
+ // log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " +
+ // action.getName());
+ // }
+ // }
+ // report(task, TaskReportStsType.OTBIN);
+ // }
+ // }
+ // }
+ // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ // for (Long taskId : taskIds) {
+ // Task task = taskService.getById(taskId);
+ // report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
+ // }
}
- //浠庤緭閫佺嚎鍙栬揣瀹屾垚
-// if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE)) {
-// WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
-// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
-// for (Long taskId : taskIds) {
-// Task task = taskService.getById(taskId);
-// report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
-// }
-// }
- //寰�杈撻�佺嚎鏀捐揣瀹屾垚
-// if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE)) {
-// WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
-// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
-// for (Long taskId : taskIds) {
-// Task task = taskService.getById(taskId);
-// report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
-// }
-// }
+ // 浠庤緭閫佺嚎鍙栬揣瀹屾垚
+ // if
+ // (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE))
+ // {
+ // WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
+ // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ // for (Long taskId : taskIds) {
+ // Task task = taskService.getById(taskId);
+ // report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
+ // }
+ // }
+ // 寰�杈撻�佺嚎鏀捐揣瀹屾垚
+ // if
+ // (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE))
+ // {
+ // WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
+ // List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ // for (Long taskId : taskIds) {
+ // Task task = taskService.getById(taskId);
+ // report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
+ // }
+ // }
// 璺緞瀹屾垚 || 鍏呯數瀹屾垚
if (agv_11_up.getCompleteType().equals(AgvCompleteType.ENTIRE_PATH_COMPLETE)
@@ -2149,10 +2282,9 @@
// segment list
List<Segment> segmentList = segmentService.list(new LambdaQueryWrapper<Segment>()
- .eq(Segment::getGroupId, serialNo)
-// .eq(Segment::getState, SegmentStateType.RUNNING.toString())
- .orderByAsc(Segment::getSerial)
- );
+ .eq(Segment::getGroupId, serialNo)
+ // .eq(Segment::getState, SegmentStateType.RUNNING.toString())
+ .orderByAsc(Segment::getSerial));
// settlement
this.settleSegmentList(segmentList, serialNo);
@@ -2170,7 +2302,6 @@
}
}
-
@Transactional
public void settleSegmentList(List<Segment> segmentList, String serialNo) {
if (Cools.isEmpty(segmentList)) {
@@ -2182,7 +2313,6 @@
for (Segment segment : segmentList) {
boolean taskComplete = false;
boolean otbin = false;
-
Task task = taskService.getById(segment.getTaskId());
assert null != task;
@@ -2219,7 +2349,6 @@
report(task, null, TaskReportStsType.OTBIN);
}
-
if (taskComplete) {
locService.taskCallBackEnd(task);
@@ -2240,8 +2369,7 @@
if (!Cools.isEmpty(serialNo)) {
List<Action> actionList = actionService.list(new LambdaQueryWrapper<Action>()
.eq(Action::getGroupId, serialNo)
- .eq(Action::getActionSts, ActionStsType.ISSUED.val())
- );
+ .eq(Action::getActionSts, ActionStsType.ISSUED.val()));
for (Action action : actionList) {
action.setActionSts(ActionStsType.FINISH.val());
action.setEndTime(now);
@@ -2273,7 +2401,9 @@
if (task.getBusId() == null) {
return;
}
- List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>().eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$()).eq(TaskReport::getTaskSts, taskReportStsType.status));
+ List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>()
+ .eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$())
+ .eq(TaskReport::getTaskSts, taskReportStsType.status));
if (!Cools.isEmpty(list)) {
log.info("TaskReport [{},{}] 宸查噸澶嶏紝涓嶅啀鎻掑叆 ==========>> ", taskReportStsType, JSON.toJSONString(task));
return;
@@ -2306,7 +2436,7 @@
return false;
}
Integer time = configService.getVal("TIMEOUT", Integer.class, 5);
- //Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);
+ // Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);
Map<String, Object> data = new HashMap<>();
data.put("askType", askType);
data.put("askSta", askSta);
@@ -2329,4 +2459,41 @@
}
return false;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/11/10
+ * @description: 淇敼搴撲綅鐘舵��
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R modifyStatus(LocSiteParams params) {
+ if (Objects.isNull(params.getStatus())) {
+ return R.error("淇敼鐘舵�佷笉鑳戒负绌猴紒锛�");
+ }
+ LocSts locSts = locStsService.getOne(new LambdaQueryWrapper<LocSts>().eq(LocSts::getUuid, params.getStatus()));
+ if (Objects.isNull(locSts)) {
+ return R.error("鏁版嵁閿欒锛屾湭鎵惧埌瀵瑰簲宸ヤ綔鐘舵�侊紒锛�");
+ }
+ if (params.getType().equals("loc")) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, params.getCode()));
+ if (Objects.isNull(loc)) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ loc.setLocSts(locSts.getId());
+ if (!locService.updateById(loc)) {
+ return R.ok("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+ Sta sta = staService.getOne(new LambdaQueryWrapper<Sta>().eq(Sta::getStaNo, params.getCode()));
+ if (Objects.isNull(sta)) {
+ return R.error("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ sta.setStatus(locSts.getStatus());
+ if (!staService.updateById(sta)) {
+ return R.error("绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1