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/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 80 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 3 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 beedbab..5d2a5d5 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,15 +1,89 @@ 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 //娣诲姞鐞嗙墖绗煎唴淇℃伅 + */ void addDownStorageCageDetails(DownStorageCageDetails details); - List<Map<String, Object>> selectCacheLeisure(); + + /** + * @return //淇敼鐞嗙墖绗煎唴淇℃伅 + */ + boolean updatedownStorageCageDetails(DownStorageCageDetails details); + + // List<DownStorageCageDetails> getCacheLeisure(); + + /** + * @param start + * @param end + * @return 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗� + */ + // List<DownStorageCageDetails> getCacheOut(int start, int end); + + /** + * @return 鏌ヨ绗煎瓙鍐呬俊鎭� + */ + List<Map<String, Object>> getCacheInfo(); + /** + * @param flowcardid + * @param width + * @return 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌绌烘牸 + */ + // List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width); + + /** + * @param start + * @param end + * @return log.info(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 "); + */ + + + /** + * @return 鍑虹墖 + */ + + List<DownStorageCageDetails> CacheOut1(int start, int end); + + + /** + * @param start + * @param end + * @return 鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖鐨勫皬鐗� + */ + List<DownStorageCageDetails> CacheOut2(int start, int end); +// /** +// * @return 鐩撮�氭煡璇� +// */ +// List<GlassInfo> DirectConnection(); + + /** + * @return 鐩撮�氭煡璇� + */ + boolean DirectConnection(GlassInfo glassInfo); + + /** + * 鑾峰彇褰撳墠闈炴湰鏋跺瓙鍙惤鏋剁殑鐜荤拑淇℃伅 + * + * @param glassId + * @param workList G06/G11:浼犲叆G06瀹為檯鑾峰彇鐨勪负鍙惤鏋禛11鐨勭幓鐠� 鍙嶄箣鍚岀悊 + * @return + */ + String getGlassInfoMaxCount(String glassId, List<Integer> workList); + + /** + * @param glassId + * @param ControlsId + * @return 鐮存崯 + */ + boolean identWorn(String glassId, int ControlsId); } -- Gitblit v1.8.0