From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 11 三月 2025 09:50:47 +0800 Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 10 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java index 4698582..07275d1 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java @@ -1,9 +1,11 @@ package com.mes.taskcache.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; import com.mes.taskcache.entity.TaskCache; import java.util.List; +import java.util.Map; /** * <p> @@ -13,26 +15,64 @@ * @author zhoush * @since 2024-04-07 */ -public interface TaskCacheService extends IService<TaskCache> { +public interface TaskCacheService extends MPJBaseService<TaskCache> { - //娣诲姞鐞嗙墖绗间换鍔� + boolean insertTaskCache(TaskCache taskCache); + /** + * 鏌ヨ纾ㄨ竟浠诲姟 + * + * @param line + * @return + */ + List<Map<String,Object>> selectEdgInfo(String line); - //鏌ヨ纾ㄨ竟浠诲姟 - List<TaskCache> selectEdgInfo(String line); + /** + * 鏌ヨ纾ㄨ竟浠诲姟 + * + * @param line + * @return + */ + TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes); - //鏌ヨ鐞嗙墖浠诲姟 + /** + * 鏌ヨ鐞嗙墖浠诲姟 + * + * @return + */ List<TaskCache> selectCacheInfo(); - //鏌ヨ鍏ㄩ儴浠诲姟 + /** + * 鏌ヨ鍏ㄩ儴浠诲姟 + * @return + */ List<TaskCache> selectAll(); - //鏌ヨ杩涚墖浠诲姟 + /** + * 鏌ヨ杩涚墖浠诲姟 + * @return + */ List<TaskCache> selectInputTaskCache(); - //鏌ヨ鍑虹墖浠诲姟 + /** + * 鏌ヨ鍑虹墖浠诲姟 + * @return + */ List<TaskCache> selectOutTaskCache(); - //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟 - List<TaskCache> selectLastOutCacheInfo(String line); + /** + * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟 + * @param line + * @return + */ + List<TaskCache> selectLastOutCacheInfos(int line); + + /** + * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟 + * @param line + * @return + */ + TaskCache selectLastOutCacheInfo(int line); + + } -- Gitblit v1.8.0