From 0e34b445bdf4cae20a75ac2ace622718e97e8025 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:41:01 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
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..361db5d 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
@@ -12,13 +12,14 @@
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
@Slf4j
@Service
public class TransferStationHandler {
- private static final long LOAD_DELAY_MS = 15000L; // load ( inbound ) delay timeout
- private static final long PLACE_DELAY_MS = 15000L; // place ( outbound ) delay timeout
+ private static final int DEFAULT_LOAD_DELAY_MS = 15000; // load ( inbound ) delay timeout
+ private static final int DEFAULT_PLACE_DELAY_MS = 1000; // place ( outbound ) delay timeout
@Autowired
private SegmentService segmentService;
@@ -30,6 +31,8 @@
private CodeService codeService;
@Autowired
private StaService staService;
+ @Autowired
+ private TravelService travelService;
/**
* 鍙栬揣锛堝叆搴擄級锛氬湪鍙栧畬绗竴涓揣鐨勬椂鍊欙紝鎷呭績婊氱瓛杈撻�佺嚎浼氭湁涓嬩竴涓揣鐗╋紝鎵�浠ュ缓璁瓵GV鍦ㄥ師鍦扮瓑寰呬竴娈垫椂闂�
@@ -68,20 +71,21 @@
if (prePosType.equals(TaskPosDto.PosType.ORI_STA)) {
// 鑳岀瘬鏈弧鎵嶇瓑
- Integer backpack = agvService.getBackpack(agvId);
+ Integer backpackCap = agvService.getBackpack(agvId);
List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(currSeg.getTravelId(), agvId);
- if (usedBackpacks.size() >= backpack) {
+ if (usedBackpacks.size() >= backpackCap) {
return false;
}
- // sign waiting
- if (currSeg.getRollerWaiting() == 0) {
- currSeg.setRollerWaiting(1);
- segmentService.updateById(currSeg);
- }
+ // mark roller waiting
+ travelService.markRollerWaiting(currSeg.getTravelId(), currentCode.getId());
+// if (currSeg.getRollerWaiting() == 0) {
+// currSeg.setRollerWaiting(1);
+// segmentService.updateById(currSeg);
+// }
// timeout
- return (now - preEndTime) < LOAD_DELAY_MS;
+ return (now - preEndTime) < Optional.ofNullable(rollerSta.getInboundWait()).orElse(DEFAULT_LOAD_DELAY_MS);
}
// outbound
@@ -95,14 +99,15 @@
return false;
}
- // sign waiting
- if (currSeg.getRollerWaiting() == 0) {
- currSeg.setRollerWaiting(1);
- segmentService.updateById(currSeg);
- }
+ // mark roller waiting
+ travelService.markRollerWaiting(currSeg.getTravelId(), currentCode.getId());
+// if (currSeg.getRollerWaiting() == 0) {
+// currSeg.setRollerWaiting(1);
+// segmentService.updateById(currSeg);
+// }
// timeout
- return (now - preEndTime) < PLACE_DELAY_MS;
+ return (now - preEndTime) < Optional.ofNullable(rollerSta.getOutboundWait()).orElse(DEFAULT_PLACE_DELAY_MS);
}
return false;
--
Gitblit v1.9.1