From 6671a156075e3fafe63b7768f2e81df4634f04f8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 25 七月 2024 10:21:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
index 29fef8c..cab1f09 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -8,6 +8,7 @@
import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -27,7 +28,7 @@
void damageBigStorageCageDetails(String glassId,int status);
- BigStorageCageDetails selectBigStorageCageDetails(String glassId);
+ List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId);
void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails);
@@ -47,7 +48,7 @@
*
* @return
*/
- TemperingLayoutDTO temperingIsAll();
+ List<TemperingLayoutDTO> temperingIsAll();
/**
* 鑾峰彇姣忎釜閽㈠寲鐗堝浘鍗犵敤鐨勬牸瀛愭暟閲�
@@ -64,4 +65,8 @@
* @return
*/
List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId);
+
+ boolean TemperingGlass(String temperingLayoutId, String engineerId);
+
+ List<Map<String, Object>> selectTemperingGlass();
}
--
Gitblit v1.8.0