From 09be761e45c76c095ddbae1c401d780bae162fdd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 19:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index 78b15e4..1327452 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -1,7 +1,6 @@
package com.mes.downstorage.service;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
import java.util.Map;
@@ -18,19 +17,19 @@
*/
boolean updatedownStorageCageDetails(DownStorageCageDetails details);
- List<DownStorageCageDetails> getCacheLeisure();
+ // List<DownStorageCageDetails> getCacheLeisure();
/**
* @param start
* @param end
* @return 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�
*/
- List<DownStorageCageDetails> getCacheOut(int start, int end);
+ // List<DownStorageCageDetails> getCacheOut(int start, int end);
/**
* @return 鏌ヨ绗煎瓙鍐呬俊鎭�
*/
- List<Map> getCacheInfo();
+ List<Map<String, Object>> getCacheInfo();
/**
@@ -38,7 +37,7 @@
* @param width
* @return 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌绌烘牸
*/
- List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
+ // List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
/**
* @param start
@@ -50,6 +49,6 @@
/**
* @return 鏌ヨ绌烘牸瀛�
*/
- List<DownStorageCageDetails> selectCacheEmpty2();
+ // List<DownStorageCageDetails> selectCacheEmpty2();
}
--
Gitblit v1.8.0