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/EdgStorageDeviceTaskHistoryService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java index 13e4038..6d60973 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java @@ -1,10 +1,10 @@ package com.mes.opctask.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.mes.largenscreen.entity.DailyProductionVO; import com.mes.opctask.entity.EdgStorageDeviceTaskHistory; import com.mes.opctask.entity.request.TaskHistoryRequest; - -import java.util.List; /** * (EdgStorageDeviceTaskHistory)琛ㄦ湇鍔℃帴鍙� @@ -14,6 +14,8 @@ */ public interface EdgStorageDeviceTaskHistoryService extends IService<EdgStorageDeviceTaskHistory> { - List<EdgStorageDeviceTaskHistory> queryEdgStorageDeviceTaskHistory(TaskHistoryRequest request); + Page<EdgStorageDeviceTaskHistory> queryEdgStorageDeviceTaskHistory(TaskHistoryRequest request); + + DailyProductionVO queryEdgDailyProduction(TaskHistoryRequest request); } -- Gitblit v1.8.0