From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 17e7aec..8e1081f 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,9 @@
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.temperingglass.entity.TemperingGlassInfo;
+
import java.util.List;
/**
@@ -12,19 +15,48 @@
* @since 2024-04-07
*/
public interface TemperingGlassInfoService extends MPJBaseService<TemperingGlassInfo> {
-
+ /**
+ * 绛夊緟涓殑鐜荤拑
+ * @return
+ */
List<TemperingGlassInfo> selectWaitingGlass();
-
- List<TemperingGlassInfo> selectIntoGlass(int layoutId);
-
+ /**
+ * 杩涚倝涓殑鐜荤拑
+ * @return
+ */
+ List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo);
+ /**
+ * 鍑虹倝涓殑鐜荤拑
+ * @return
+ */
List<TemperingGlassInfo> selectOutGlass();
-
+ /**
+ * 閽㈠寲鍚庣殑鐜荤拑
+ * @return
+ */
List<TemperingGlassInfo> selectOverGlass();
-
+ /**
+ * 鏌ヨ閽㈠寲鍚庣殑鐗堝浘id
+ * @return
+ */
List<TemperingGlassInfo> selectLayoutId();
-
+ /**
+ * 鏌ヨ閽㈠寲鐘舵��
+ * @return
+ */
List<TemperingGlassInfo> selectTaskType();
-
+ /**
+ * 閽㈠寲妯″潡鐮存崯
+ * @return
+ */
Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo);
+ /**
+ * 鏍规嵁鐐夊彿鏌ラ挗鍖栫増鍥剧幓鐠冧俊鎭�
+ * @return
+ */
+ List<TemperingGlassInfo> selectGlassInfoById(Integer id);
+ GlassInfo selectTempering(GlassInfo glassInfo);
+
+ List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo);
}
--
Gitblit v1.8.0