From 26bb8f33c4d0a2b674e3b6023b3d368f5c2149da Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Thu, 15 Jan 2026 16:35:31 +0800 Subject: [PATCH] =?UTF-8?q?30=E5=BC=80=E5=8D=B7=E6=9C=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/strip/SegmentTrackerService.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java b/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java index 832313b..cc6f3ac 100644 --- a/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java +++ b/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java @@ -373,11 +373,6 @@ public class SegmentTrackerService { Set prevReached = coilReachedDevices.computeIfAbsent(coilId, k -> Collections.newSetFromMap(new ConcurrentHashMap<>())); - if (entry.getPayOffReelNumber()-1 == DeviceEnum.POR1.getIdx()) { - prevReached.remove(DeviceEnum.POR2); - } else { - prevReached.remove(DeviceEnum.POR1); - } if (LogRateLimiter.shouldLog("TRACK:" + coilId, 5000)) { logDataService.logInfo("MATMAP-TRACK", "Built local matmap cache=" + JSONUtil.toJsonStr(prevReached) + " ..."); @@ -392,12 +387,11 @@ public class SegmentTrackerService { if (headPos.compareTo(BigDecimal.valueOf(dynPos)) >= 0 && !prevReached.contains(d)) { - MatmapDTO matmap = MatmapUtil.getMatmap(entry.getPayOffReelNumber()-1); + MatmapDTO matmap = MatmapUtil.getMatmap(entry.getPayOffReelNumber()); MatmapUtil.setMatId(d.getIdx(), coilId,matmap.getPlanId()); if (d == DeviceEnum.WELDER) { logDataService.logInfo("MATMAP-TRACK", "Coil reached welder, update plan status. coil=" + coilId + ", headPos=" + headPos); - log.info("matmap.planid={},coilid={}", matmap.getPlanId(), coilId); trackService.l1OperateMat(L1OperateMatForm.builder() .entryMatId(coilId) .planId(matmap.getPlanId())