From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发,与电气调试中,新增磨边队列表 2、卧理新增历史任务表,记录卧理两台设备执行过的历史数据 3、大理片笼opc任务,新增玻璃进笼计算方式:在笼内存储同炉的多片玻璃,笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发,新增历史任务表记录上片的历史信息

---
 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