From 43a6eccb37602e27c56bf7c40a74c8350ecfd82e Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 15 五月 2024 11:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..173056a 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,12 +1,12 @@
package com.mes.downstorage.service;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
import java.util.Map;
-public interface DownStorageCageDetailsService {
+public interface DownStorageCageDetailsService extends MPJBaseService<DownStorageCageDetails> {
/**
* @return //娣诲姞鐞嗙墖绗煎唴淇℃伅
*/
@@ -18,19 +18,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 +38,7 @@
* @param width
* @return 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌绌烘牸
*/
- List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
+ // List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
/**
* @param start
@@ -48,8 +48,8 @@
List<DownStorageCageDetails> CacheOut(int start, int end);
/**
- * @return 鏌ヨ绌烘牸瀛�
+ * @return 鍑虹墖
*/
- List<DownStorageCageDetails> selectCacheEmpty2();
+ List<DownStorageCageDetails> CacheOut1(int start, int end);
}
--
Gitblit v1.8.0