From 881140565d04e33ba52515a2651ca789a486e056 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 21 一月 2026 15:58:26 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 6 ++++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java | 2 +-
zy-acs-manager/src/main/resources/application.yml | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 31 +++++++++++++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 1 +
7 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java
index 8e7e549..05a08f7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java
@@ -46,7 +46,7 @@
final String staNo = sta.getStaNo();
// url
- String url = this.buildUrl("/station/query");
+ String url = this.buildUrl("/cv/station/query");
// headers
Map<String, String> headers = new HashMap<>();
// params
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
index 75d0fc2..f6060a4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
@@ -24,7 +24,7 @@
@Autowired
private MainService mainService;
- @PreAuthorize("hasAuthority('open:bus:submit')")
+// @PreAuthorize("hasAuthority('open:bus:submit')")
@PostMapping("/bus/submit")
@OperationLog("generate task from open api")
public R save(@RequestBody OpenBusSubmitParam param) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
index 0dc1f6f..ac7bdd8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
@@ -221,6 +221,7 @@
// continue;
// }
// in TransferStationHandler.hasDelayAtSta
+
Segment currSeg = segmentService.getRollerWaiting(agvId, sta.getCode(), TaskPosDto.PosType.ORI_STA);
if (null == currSeg) {
continue;
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 fbd9471..e7cdbc2 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
@@ -1868,6 +1868,7 @@
staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
break;
}
+ log.info("Agv [{}] 鍙栨斁璐ф垚鍔�", protocol.getAgvNo()); // todo
success = true;
break;
case DEST_STA:
@@ -1883,6 +1884,7 @@
staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
break;
}
+ log.info("Agv [{}] 鍙栨斁璐ф垚鍔�", protocol.getAgvNo()); // todo
success = true;
break;
default:
@@ -1899,8 +1901,8 @@
AGV_06_DOWN agv_06_down = new AGV_06_DOWN();
agv_06_down.setSerialNo(agv_06_up.getSerialNo());
agv_06_down.setActionCode(agv_06_up.getActionCode());
- //agv_06_down.setResult(success ? 1 : 0);
- agv_06_down.setResult(1);
+ agv_06_down.setResult(success ? 1 : 0);
+ //agv_06_down.setResult(0);
redis.push(RedisConstant.AGV_PATH_DOWN_FLAG, AgvProtocol.build(protocol.getAgvNo()).setMessageBody(agv_06_down));
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
index 12c37f9..af6e933 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
@@ -17,7 +17,7 @@
@Service
public class TransferStationHandler {
- private static final long LOAD_DELAY_MS = 15000L; // load ( inbound ) delay timeout
+ private static final long LOAD_DELAY_MS = 60000L; // load ( inbound ) delay timeout
private static final long PLACE_DELAY_MS = 15000L; // place ( outbound ) delay timeout
@Autowired
@@ -69,7 +69,7 @@
// 鑳岀瘬鏈弧鎵嶇瓑
Integer backpack = agvService.getBackpack(agvId);
- List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(currSeg.getTravelId(), agvId);
+ List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(currSeg.getTravelId(), agvId); // todo:vincent 鎷夸笉鍒版暟鎹�
if (usedBackpacks.size() >= backpack) {
return false;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
index 21e8ad2..2bf91fd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -8,11 +8,14 @@
import com.zy.acs.manager.common.domain.TaskDto;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.BusStsType;
+import com.zy.acs.manager.manager.enums.LocStsType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.BusMapper;
import com.zy.acs.manager.manager.service.BusService;
+import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +29,37 @@
@Autowired
private TaskService taskService;
+ @Autowired
+ private LocService locService;
@Override
public Bus selectByUuid(String uuid) {
return this.getOne(new LambdaQueryWrapper<Bus>().eq(Bus::getUuid, uuid));
+ }
+
+ private void test(OpenBusSubmitParam param) {
+ if (Cools.isEmpty(param)) {
+ return;
+ }
+ List<TaskDto> taskList = param.getTaskList();
+ if (Cools.isEmpty(taskList)) {
+ return;
+ }
+ for (TaskDto dto : taskList) {
+ if (dto.getPriority() == 9527) {
+ if (Cools.isEmpty(dto.getDestLoc())) {
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
+ .ge(Loc::getRow, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
+ if (Cools.isEmpty(locList)) {
+ break;
+ }
+ log.error("there is no such idle loc");
+ Collections.shuffle(locList);
+ Loc loc = locList.get(0);
+ dto.setDestLoc(loc.getLocNo());
+ }
+ }
+ }
}
@Override
@@ -40,6 +70,7 @@
if (Cools.isEmpty(param.getBatch())) {
return "Batch cannot be empty!";
}
+ this.test(param);
Set<String> oriStaNoSet = new HashSet<>();
Set<String> oriLocNoSet = new HashSet<>();
Set<String> destStaNoSet = new HashSet<>();
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index a7a7617..94987b1 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -51,7 +51,7 @@
index: 8
convey-plc:
- host: 10.10.10.212
+ host: 10.10.10.222
port: 9090
floyd:
--
Gitblit v1.9.1