From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
index 30dcd2a..91c2bf7 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
@@ -1,8 +1,8 @@
 package com.mes.rawglassstation.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
 import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
 
 import java.util.List;
 
@@ -12,7 +12,19 @@
  */
 public interface RawGlassStorageStationService extends IService<RawGlassStorageStation> {
     List<RawGlassStorageStation> selectStations();
+
     boolean updateRawGlassStorageStation(String slot);
+
     boolean deleteRawGlassStorageStation(String device_id);
+
     boolean insertRawGlassStorageStation(RawGlassStorageStation rw);
+
+  /**
+   * 鑾峰彇宸ヤ綅鍙婂搴旂殑鍘熺墖淇℃伅
+   *
+   * @return
+   */
+  List<RawGlassStorageDetails> listRawGlassDetails();
+
+  boolean updateSlotState(Integer slot, Integer enableState);
 }
\ No newline at end of file

--
Gitblit v1.8.0