From 8a9b0adc7fe0f72c4de8c8e5d14e282f5913d63d Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 06 十二月 2024 14:48:36 +0800 Subject: [PATCH] 1、fixbug:笼内玻璃错乱问题解决 2、中空问题修复:避免多个线程拿到的空格相同 3、swagger名称显示 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java index 0e1440e..4d69ac4 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java @@ -298,21 +298,22 @@ continue; } int sequence = -1; - int startSlot = -1; + int targetSlot = -1; for (BigStorageSequenceDTO item : sequenceDTOList) { if (item.getMaxSequence() == sequence - 1) { //鐢熸垚璋冨害浠诲姟 - int targetSlot = item.getSlot(); + int startSlot = item.getSlot(); list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>() .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).eq(BigStorageCageDetails::getSlot, startSlot)); - computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task", targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH); + computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task", + targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH); List<Integer> slotList = new ArrayList<>(); slotList.add(targetSlot); updateSlotRemainBySlots(slotList); break loop; } sequence = item.getMinSequence(); - startSlot = item.getSlot(); + targetSlot = item.getSlot(); } } } -- Gitblit v1.8.0