From e31a077927d47bd05bcfdc3367deafb8c4069c6d Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 26 十二月 2024 23:57:34 +0800 Subject: [PATCH] 1、卧式理片玻璃替换仅替换版图信息 2、指定钢化、指定工程fixbug:膜系字段修改为filmsId 3、移除大理片笼向前端推送钢化历史任务数据 4、中空领取任务界面接口改造:新增开始/暂停/结束任务按钮,流程卡列表、预览任务、删除任务接口 5、领取/强制任务接口改造:新增除膜信息、李赛克文件需要的数据信息 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 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 f90c418..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,11 +1,11 @@ package com.mes.taskcache.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.mes.edgstoragecage.entity.EdgStorageCageDetails; -import com.mes.glassinfo.entity.GlassInfo; +import com.github.yulichang.base.MPJBaseService; import com.mes.taskcache.entity.TaskCache; import java.util.List; +import java.util.Map; /** * <p> @@ -15,24 +15,29 @@ * @author zhoush * @since 2024-04-07 */ -public interface TaskCacheService extends IService<TaskCache> { +public interface TaskCacheService extends MPJBaseService<TaskCache> { - /** - * 娣诲姞鐞嗙墖绗间换鍔� - * @param taskCache - * @return - */ + boolean insertTaskCache(TaskCache taskCache); - /** * 鏌ヨ纾ㄨ竟浠诲姟 + * * @param line * @return */ - List<TaskCache> selectEdgInfo(String line); + List<Map<String,Object>> selectEdgInfo(String line); + + /** + * 鏌ヨ纾ㄨ竟浠诲姟 + * + * @param line + * @return + */ + TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes); /** * 鏌ヨ鐞嗙墖浠诲姟 + * * @return */ List<TaskCache> selectCacheInfo(); @@ -60,13 +65,14 @@ * @param line * @return */ - List<TaskCache> selectLastOutCacheInfos(String line); + List<TaskCache> selectLastOutCacheInfos(int line); /** * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟 * @param line * @return */ - TaskCache selectLastOutCacheInfo(String line); + TaskCache selectLastOutCacheInfo(int line); + } -- Gitblit v1.8.0