From b8b5b799e8770d29ac0a5b8530c468d74173c487 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 03 一月 2025 23:22:53 +0800
Subject: [PATCH] 1、手动生成李赛克文件功能已完成、待联调 2、对接除膜机，调整对应的交互 3、中空两条线新增空闲信号，优先李赛克线优先 4、fixbug:指定工程后增加版图id排序，优先炉号从小到大，版序从小到大
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index 6d78c74..4b69491 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -1,7 +1,10 @@
package com.mes.glassinfo.service;
-import com.mes.glassinfo.entity.GlassInfo;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;
+
import java.util.List;
import java.util.Map;
@@ -18,22 +21,24 @@
* 鏌ヨ灏忕墖琛�
* @return List<GlassInfo>
*/
- List<GlassInfo> selectGlassInfo(String engineeringId);
+ List<GlassInfo> selectGlassInfo(Engineering engineeringId);
/**
* 淇濆瓨灏忕墖琛�
*/
void saveGlassInfo(List<GlassInfo> glassinfo);
- /**
- * @param flowCardId
- * @return 鏍规嵁娴佺▼鍗″彿鏌ヨ鐜荤拑淇℃伅
- */
- int getGlassInfoCountByFlowCardId(String flowCardId);
+ int getGlassInfoCountByFlowCardId(String flowCardId, int layer);
/**
- * @return
- * 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
+ * @return 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
*/
List<Map<String, Object>> getFlowCardId();
+
+
+ List<HollowGlassInfoDTO> listBySize(String engineerId);
+
+ void deleteTask(String engineerId);
+
+ List<GlassInfo> selectEdgGlassInfo(String engineering);
}
--
Gitblit v1.8.0