30开卷机问题
This commit is contained in:
@@ -373,11 +373,6 @@ public class SegmentTrackerService {
|
|||||||
|
|
||||||
Set<DeviceEnum> prevReached = coilReachedDevices.computeIfAbsent(coilId,
|
Set<DeviceEnum> prevReached = coilReachedDevices.computeIfAbsent(coilId,
|
||||||
k -> Collections.newSetFromMap(new ConcurrentHashMap<>()));
|
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)) {
|
if (LogRateLimiter.shouldLog("TRACK:" + coilId, 5000)) {
|
||||||
logDataService.logInfo("MATMAP-TRACK", "Built local matmap cache=" + JSONUtil.toJsonStr(prevReached) + " ...");
|
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)) {
|
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());
|
MatmapUtil.setMatId(d.getIdx(), coilId,matmap.getPlanId());
|
||||||
|
|
||||||
if (d == DeviceEnum.WELDER) {
|
if (d == DeviceEnum.WELDER) {
|
||||||
logDataService.logInfo("MATMAP-TRACK", "Coil reached welder, update plan status. coil=" + coilId + ", headPos=" + headPos);
|
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()
|
trackService.l1OperateMat(L1OperateMatForm.builder()
|
||||||
.entryMatId(coilId)
|
.entryMatId(coilId)
|
||||||
.planId(matmap.getPlanId())
|
.planId(matmap.getPlanId())
|
||||||
|
|||||||
Reference in New Issue
Block a user