From 60f572b6b7c516db6ccda32c768f9117b4e51167 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 17 四月 2025 16:49:58 +0800 Subject: [PATCH] 1、fixbug:中空出片优先lisec问题解决 2、卧式理片笼出片路径调整,优先小线 3、fixbug:卧式理片笼两条线同时跑发生大线往小线送玻璃的情况 4、磨边后新增玻璃交互,为plc获取不到玻璃尺寸做二道保障 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java index 614ff80..c7cf26a 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java @@ -30,7 +30,7 @@ .eq(StringUtils.checkValNotNull(request.getTaskState()), EdgStorageDeviceTaskHistory::getTaskState, request.getTaskState()) .eq(StringUtils.checkValNotNull(request.getTaskType()), EdgStorageDeviceTaskHistory::getTaskType, request.getTaskType()) .between(StringUtils.checkValNotNull(request.getStartTime()), EdgStorageDeviceTaskHistory::getCreateTime, request.getStartTime(), - request.getEndTime()).orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 20"); + request.getEndTime()).orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime); if (StringUtils.isNotBlank(request.getGlassId())) { wrapper.and(e -> e.like(EdgStorageDeviceTaskHistory::getGlassIdIn, request.getGlassId()) .or().like(EdgStorageDeviceTaskHistory::getGlassIdOut, request.getGlassId())); -- Gitblit v1.8.0