From 268a9d6e7b1596abc9ac49ca9cf4b32e89998a9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 19 十二月 2024 10:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 16 +++++++++++-----
1 files changed, 11 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 fd74acf..e698833 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,11 @@
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 com.mes.uppattenusage.entity.UpPattenUsage;
+
import java.util.List;
import java.util.Map;
@@ -24,16 +28,18 @@
*/
void saveGlassInfo(List<GlassInfo> glassinfo);
-// int getGlassInfoCountByFlowCardId(String flowCardId,int layer);
+ int getGlassInfoCountByFlowCardId(String flowCardId, int layer);
/**
- * @return
- * 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
+ * @return 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
*/
-// List<Map<String, Object>> getFlowCardId();
+ List<Map<String, Object>> getFlowCardId();
+ List<HollowGlassInfoDTO> listBySize(String engineerId);
+ void deleteTask(String engineerId);
+ List<GlassInfo> selectEdgGlassInfo(String engineering);
}
--
Gitblit v1.8.0