From 691eb8477b0a2b8d6f8e94788187b7b470374d86 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 18 二月 2025 14:49:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 710d964..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);
- 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