From 8114ef9bf2704a2bc05a15a36ab677808195a274 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 10:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index 3ebeae3..de870f1 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -1,6 +1,10 @@
package com.mes.temperingglass.service;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
+
import com.github.yulichang.base.MPJBaseService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.entity.LoadGlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+
import java.util.List;
/**
@@ -47,5 +51,13 @@
* @return
*/
Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo);
+ /**
+ * 鏍规嵁鐐夊彿鏌ラ挗鍖栫増鍥剧幓鐠冧俊鎭�
+ * @return
+ */
+ List<TemperingGlassInfo> selectGlassInfoById(Integer id);
+ GlassInfo selectTempering(GlassInfo glassInfo);
+
+ List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
}
--
Gitblit v1.8.0