From 47ab1c46b5141f572381a2a27613f728e3bf96c5 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 20 五月 2024 14:18:16 +0800 Subject: [PATCH] 1、卧式理片笼对接过程中bug修复 2、上片机协议修改 3、临时解决json文件打包后读取不到文件问题 4、上片新增接口修改上片机联动请求 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 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 f282a63..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,17 +1,55 @@ 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); - //淇敼鐞嗙墖绗煎唴淇℃伅 + + /** + * @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(" 鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗�, 骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖 "); + */ + List<DownStorageCageDetails> CacheOut(int start, int end); + + /** + * @return 鍑虹墖 + */ + + List<DownStorageCageDetails> CacheOut1(int start, int end); } -- Gitblit v1.8.0