From 538cd905b0819a22651fff47150bb7dfeae45d4a Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期一, 17 十一月 2025 08:35:04 +0800
Subject: [PATCH] 111
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 824 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 774 insertions(+), 50 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 89c8669..91067f5 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
@@ -137,6 +142,7 @@
throw new BusinessException("Internal Server Error!");
}
Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, true);
+ Integer locStaTaskNum = configService.getVal("LOC_STA_TASK_NUM", Integer.class, 2);
// 淇濆瓨浠诲姟
@@ -190,6 +196,11 @@
if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
throw new BusinessException("destSta锛�" + task.getDestSta$() + " is not in IDLE status");
}
+ } else {
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, destSta.getId()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
+ if (!Cools.isEmpty(list) && list.size() >= locStaTaskNum) {
+ throw new BusinessException("destSta锛�" + task.getDestSta$() + " task more");
+ }
}
destSta.setStaSts(StaStsType.READY_RELEASE.val());
destSta.setUpdateTime(now);
@@ -199,11 +210,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)) {
@@ -237,6 +248,11 @@
if (destSta.getStaTypeIsCheck() != 1) {
if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
throw new BusinessException("destSta锛�" + task.getDestSta$() + " is not in IDLE status");
+ }
+ } else {
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, destSta.getId()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
+ if (!Cools.isEmpty(list) && list.size() >= locStaTaskNum) {
+ throw new BusinessException("destSta锛�" + task.getDestSta$() + " task more");
}
}
destSta.setStaSts(StaStsType.READY_RELEASE.val());
@@ -759,7 +775,6 @@
// 闇�瑕佽蛋琛�
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);
@@ -777,8 +792,16 @@
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
boolean reverse = false;
if (nextDirection.equals((workDirection + 180) % 360)) {
- nextDirection = workDirection;
- reverse = true;
+ List<String> list = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054");
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())).equals(TaskPosDto.PosType.ORI_STA)
+ || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && list.contains(lastCode.getData())) {
+ reverse = false;
+ lastDirection = nextDirection;
+ } else {
+ nextDirection = workDirection;
+ reverse = true;
+ }
}
// 绗簩姝ワ細鍒ゆ柇褰撳墠鑺傜偣鏄惁鍙互鏃嬭浆
@@ -799,7 +822,52 @@
nextDirection = lastDirection;
reverse = true;
} else {
+ 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(), // 鎬荤嚎
+ 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 // 宸ヤ綔鏃堕棿
+ ));
+ } else {
+ // 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(nextDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ }
+ lastDirection = nextDirection;
+ }
+ } else {
+ 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(), // 鎬荤嚎
@@ -809,17 +877,622 @@
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;
}
}
}
+
+ // 绗竴涓姩浣滀竴瀹氭槸 turn
+ if (actionList.isEmpty() && 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(nextDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+
+ lastDirection = nextDirection;
+ }
+
+ // run
+ ActionTypeType actionType = ActionTypeType.StraightAheadTurnable;
+ if (reverse) {
+ actionType = ActionTypeType.StraightBackTurnable;
+ }
+ 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 // 宸ヤ綔鏃堕棿
+ ));
+
+ lastCode = nextCode;
+
+ }
+ }
+
+ // 鍒濆鏂瑰悜鍊艰ˉ涓�
+ if (first) {
+ if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
+ Double turnDirection = workDirection;
+ List<String> list = Arrays.asList("00000051", "00000052", "00000053", "00000054");
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())).equals(TaskPosDto.PosType.ORI_STA)
+ || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && list.contains(lastCode.getData())) {
+ 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 // 宸ヤ綔鏃堕棿
+ ));
+ lastDirection = workDirection;
+ }
+ }
+ first = false;
+ }
+
+ // 浣滀笟鐐瑰姩浣�
+ AgvDirectionType agvDirectionType;
+ Double staWorkDirection;
+ AgvBackpackType backpackType = AgvBackpackType.query(segment.getBackpack());
+ switch (Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))) {
+ case ORI_LOC:
+ assert backpackType != null;
+ // 妫�楠屾柟鍚�
+ if (!lastDirection.equals(workDirection)) {
+ lastDirection = workDirection;
+// throw new CoolException(agvNo agvNo+ "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+ }
+ // 璐ф灦鍙栬揣
+ Loc oriLoc = locService.getById(task.getOriLoc());
+ // 璁＄畻宸﹀彸鏂瑰悜
+ agvDirectionType = mapService.calculateAgvWorkDirectionByShelf(oriLoc, lastCode);
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyTakeFromShelvesLoc.desc, // 鍚嶇О
+ (double) agvDirectionType.val, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(oriLoc.getOffset()), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyTakeFromShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ // 鏆傚瓨鐐规斁璐�
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyReleaseToAgvSite.desc, // 鍚嶇О
+ (double) backpackType.lev, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(backpackType.height), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyReleaseToAgvSite.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ break;
+ case DEST_LOC:
+ assert backpackType != null;
+ // 妫�楠屾柟鍚�
+ if (!lastDirection.equals(workDirection)) {
+ lastDirection = workDirection;
+// throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+ }
+ // 鏆傚瓨鐐瑰彇璐ц揣
+ 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 // 宸ヤ綔鏃堕棿
+ ));
+
+ // 璐ф灦鏀捐揣
+ Loc destLoc = locService.getById(task.getDestLoc());
+ // 璁＄畻宸﹀彸鏂瑰悜
+ agvDirectionType = mapService.calculateAgvWorkDirectionByShelf(destLoc, lastCode);
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyReleaseToShelvesLoc.desc, // 鍚嶇О
+ (double) agvDirectionType.val, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(destLoc.getOffset()), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyReleaseToShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ break;
+ case ORI_STA:
+ // 绔欑偣鍙栬揣
+ 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;
+// }
+ // 璁＄畻璐у弶宸ヤ綔鏂瑰悜
+ staWorkDirection = mapService.calculateAgvWorkDirectionByStation(oriStaWorkDirection, lastDirection);
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyTakeFromShelvesLoc.desc, // 鍚嶇О
+ Double.parseDouble("0"), // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(oriSta.getOffset()), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyTakeFromShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now, // 宸ヤ綔鏃堕棿
+ oriSta.getStaTypeIsCheck() == 1 ? 1 : 0,
+ oriSta.getStaNo()
+ ));
+ // 鏆傚瓨鐐规斁璐�
+ assert backpackType != null;
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyReleaseToAgvSite.desc, // 鍚嶇О
+ (double) backpackType.lev, // 灞炴�ш皰
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(backpackType.height), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyReleaseToAgvSite.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ break;
+ case DEST_STA:
+ // 绔欑偣鏀捐揣
+ 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 + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+// }
+//
+// 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(
+ 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);
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.ReadyReleaseToShelvesLoc.desc, // 鍚嶇О
+ Double.parseDouble("0"), // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(destSta.getOffset()), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.ReadyReleaseToShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now, // 宸ヤ綔鏃堕棿
+ destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
+ 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) && 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 // 宸ヤ綔鏃堕棿
+ ));
+ 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 // 宸ヤ綔鏃堕棿
+ ));
+ 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;
+// }
+ String runToWaitHeightFlag = configService.getVal("RunToWaitHeightFlag", String.class);
+ if (!Cools.isEmpty(runToWaitHeightFlag) && runToWaitHeightFlag.contains(agvId.toString())) {
+ String runToWaitHeight = configService.getVal("RunToWaitHeight", String.class);
+ if (Cools.isEmpty(runToWaitHeight)) {
+ runToWaitHeight = "800";
+ }
+ Double runToWaitHeightValue = configService.getVal("RunToWaitHeightValue", Double.class);
+ if (runToWaitHeightValue == 0) {
+ runToWaitHeightValue = 1D;
+ }
+ // 淇绌烘寚閽堝紓甯革細妫�鏌astCode鏄惁涓簄ull
+ if (lastCode == null) {
+ 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 // 宸ヤ綔鏃堕棿
+ ));
+ }
+ break;
+ case MOVE:
+ break;
+ default:
+ break;
+ }
+
+ }
+
+ // finish
+ actionList.add(new Action(
+ null, // 缂栧彿
+ null, // 鎬荤嚎
+ null, // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.FinishPath.desc, // 鍚嶇О
+ null, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ null, // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.FinishPath.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+
+ List<Action> newActionList = actionSorter.optimizeSort(actionList);
+ String groupId = String.valueOf(snowflakeIdWorker.nextId()).substring(3);
+
+ // save action
+ int i = newActionList.size();
+ for (Action action : newActionList) {
+// action.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ action.setGroupId(groupId);
+ action.setPriority(i);
+ i -= 1;
+ }
+ if (!actionService.saveBatch(newActionList)) {
+ throw new BusinessException("group[" + groupId + "] 鍔ㄤ綔淇濆瓨澶辫触");
+ }
+
+ // update segment
+ for (Segment item : segmentList) {
+ item.setGroupId(groupId);
+ item.setState(SegmentStateType.RUNNING.toString());
+ item.setUpdateTime(now);
+ if (null != algoStartTime) {
+ item.setAlgoTime((int) (now.getTime() - algoStartTime.getTime()));
+ }
+ if (!segmentService.updateById(item)) {
+ throw new CoolException("鏇存柊Segment澶辫触");
+ }
+ }
+
+ log.info("{}鍙稟gv鍔ㄤ綔缁勮瀹屾垚锛屾寚浠ゆ暟閲忥細{}", agvNo, newActionList.size());
+ } catch (Exception e) {
+ log.error("mainService.generateAction", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+
+ if (!Cools.isEmpty(pathList)) {
+ pathList.remove(0);
+ List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(null, pathList);
+ mapDataDispatcher.clearDynamicMatrixByCodeList(null, codeMatrixIdxList);
+ }
+
+ throw new RuntimeException("generateAction method caught an exception, rolling back transaction.", e);
+ }
+ }
+
+
+ /**
+ * 鏍规嵁鍒嗙墖鐢熸垚鍔ㄤ綔 ( 杞﹁締鍙兘宸茬粡鍋氳繃涓�浜涗换鍔′簡,姝ｅ湪绛夊緟涓嬩竴娈典换鍔� )
+ */
+ @Transactional
+ 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);
+ int angleOffsetVal = configService.getVal("mapAngleOffsetVal", Integer.class);
+ String agvNo = agvService.getAgvNo(agvId);
+// if (!agvService.judgeEnable(agvId)) {
+// throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�...");
+// }
+
+ AgvModel agvModel = agvModelService.getByAgvId(agvId);
+ Double workDirection = agvModel.getWorkDirection();
+ AgvSpeedType agvSpeedType = AgvSpeedType.query(agvModel.getTravelSpeed());
+ assert agvSpeedType != null;
+
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
+
+ List<Action> actionList = new ArrayList<>();
+ // start node
+ Code lastCode = codeService.getCacheById(agvDetail.getRecentCode());
+ Double lastDirection = MapService.mapToNearest(agvDetail.getAgvAngle());
+ if (!lastCode.getData().equals(pathList.get(0))) {
+ throw new CoolException("AGV[" + agvNo + "]瀹氫綅鍋忕Щ...");
+ }
+
+ //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;
+ }
+ }
+
+ boolean first = true;
+ for (Segment segment : segmentList) {
+
+ // 鍒嗘鎵�灞炵殑Task
+ Task task = taskService.getById(segment.getTaskId());
+
+ // 鑺傜偣鏉＄爜
+ 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;
+
+ boolean reverse = false;
+ 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);
+
+ // 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
+ if (!nextDirection.equals((workDirection + 180) % 360)) {
+ nextDirection = workDirection;
+ reverse = true;
+ }
+
+ // 绗簩姝ワ細鍒ゆ柇褰撳墠鑺傜偣鏄惁鍙互鏃嬭浆
+ if (!lastCode.getCornerBool()) {
+ // 濡傛灉鏄綔涓氭柟鍚戯紝浣嗘槸灏忚溅鍦ㄥ贩閬撳唴鏂瑰悜閿欒锛屽垯鍋滄
+ if (reverse && !lastDirection.equals(nextDirection)) {
+// throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+ }
+ // 濡傛灉涓嶆槸浣滀笟鏂瑰悜锛屽垽鏂槸鍚︾浉鍙嶆柟鍚戯紝濡傛灉鍙嶆柟鍚戝垯鍊掗��琛岃蛋
+ if (nextDirection.equals((lastDirection + 180) % 360)) {
+ nextDirection = lastDirection;
+ reverse = true;
+ }
+ } else {
+ if (!lastDirection.equals(nextDirection)) {
+ // 濡傛灉涓嬩釜鑺傜偣鏂瑰悜涓庡綋鍓峚gv鏂瑰悜鐩稿弽锛屽垯鍊掗��琛岃蛋锛屼絾鏄鏋滃綋鍓峚gv鏂瑰悜姝ｅソ涓庡伐浣滄柟鍚戠浉鍙嶏紝鍒欐棆杞嚦宸ヤ綔鏂瑰悜
+ if (nextDirection.equals((lastDirection + 180) % 360) && !workDirection.equals((lastDirection + 180) % 360)) {
+ nextDirection = lastDirection;
+ reverse = true;
+ } else {
+ // 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(nextDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+
+ lastDirection = nextDirection;
+ }
+ }
+ }
+ }
+
// 绗竴涓姩浣滀竴瀹氭槸 turn
if (actionList.isEmpty()) {
@@ -1093,9 +1766,8 @@
ActionTypeType.ReadyTakeFromAgvSite.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
- now, // 宸ヤ綔鏃堕棿
- destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
- destSta.getStaNo()
+ now // 宸ヤ綔鏃堕棿
+
));
// 璁＄畻璐у弶宸ヤ綔鏂瑰悜
staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection, lastDirection);
@@ -1112,14 +1784,16 @@
ActionTypeType.ReadyReleaseToConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
- now // 宸ヤ綔鏃堕棿
+ now, // 宸ヤ綔鏃堕棿
+ destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
+ 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, // 鎬荤嚎
@@ -1262,7 +1936,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)) {
@@ -1271,7 +1945,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);
}
}
@@ -1490,11 +2164,11 @@
// }
// }
- 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);
+// }
}
// 鍑哄簱鍙栬揣
@@ -1528,31 +2202,31 @@
// }
// }
// }
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- report(task, agv_11_up.getQrCode(), 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.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.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)
@@ -1592,6 +2266,8 @@
// task
for (Segment segment : segmentList) {
boolean taskComplete = false;
+ boolean otbin = false;
+
Task task = taskService.getById(segment.getTaskId());
assert null != task;
@@ -1602,6 +2278,7 @@
switch (Objects.requireNonNull(posType)) {
case ORI_STA:
case ORI_LOC:
+ otbin = true;
break;
case DEST_STA:
case DEST_LOC:
@@ -1622,16 +2299,24 @@
break;
}
+ if (otbin) {
+ locService.taskCallBackOtbin(task);
+ report(task, null, TaskReportStsType.OTBIN);
+ }
+
+
if (taskComplete) {
- locService.taskCallBack(task);
+ locService.taskCallBackEnd(task);
task.setTaskSts(TaskStsType.COMPLETE.val());
task.setEndTime(now);
task.setUpdateTime(now);
if (!taskService.updateById(task)) {
log.error("Task [{}] 鏇存柊澶辫触 锛侊紒锛�", task.getSeqNum());
- } else {
- report(task, null, TaskReportStsType.END);
+ }
+ report(task, null, TaskReportStsType.END);
+ if (task.getSeqNum() != null && task.getSeqNum().contains("SSX-CK")) {
+ report(task, "1001", TaskReportStsType.COMPLETED);
}
}
}
@@ -1675,11 +2360,12 @@
}
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 [{}] 宸查噸澶嶏紝涓嶅啀鎻掑叆 ==========>> ", JSON.toJSONString(task));
+ log.info("TaskReport [{},{}] 宸查噸澶嶏紝涓嶅啀鎻掑叆 ==========>> ", taskReportStsType, JSON.toJSONString(task));
return;
}
TaskReport taskReport = new TaskReport();
taskReport.setAgvId(task.getAgvId());
+ taskReport.setAgvNo(task.getAgvId$());
taskReport.setBusNo(task.getBusId$());
taskReport.setCreateTime(new Date());
taskReport.setCompleted(0);
@@ -1689,6 +2375,7 @@
taskReport.setEventType(taskReportStsType.name);
taskReport.setSeqNum(task.getSeqNum());
taskReport.setZpallet(task.getZpallet());
+
if (!taskReportService.save(taskReport)) {
log.info("TaskReport [{}] 鎻掑叆澶辫触 ==========>> ", JSON.toJSONString(taskReport));
} else {
@@ -1698,10 +2385,10 @@
private boolean askSta(Integer askType, String askSta) {
log.info("鏉ヨ闂緭閫佺嚎浜嗭紝{}锛寋}", askType, askSta);
- String wmsUrl = configService.getVal("WMS_URL", String.class);
+ String wmsUrl = configService.getVal("WCS_URL", String.class);
String wmsPath = configService.getVal("WMS_STA", String.class);
if (Cools.isEmpty(wmsPath) || Cools.isEmpty(wmsUrl)) {
- return true;
+ return false;
}
Integer time = configService.getVal("TIMEOUT", Integer.class, 5);
//Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);
@@ -1727,4 +2414,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