From 2bcc7bbdf9257c5b9e952f7e206123bf1c3d6826 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 08 八月 2024 15:34:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java index 1aa6fbb..6e9c45d 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java @@ -7,6 +7,7 @@ import com.mes.downworkstation.entity.dto.DownGlassInfoDTO; import java.util.List; +import java.util.Map; public interface DownGlassInfoService extends IService<DownGlassInfo> { @@ -59,8 +60,9 @@ */ String setDownGlassInfoRequest(DownGlassInfoRequest request); - /** - * 鏌ヨ鏋跺瓙涓婄粦瀹氭祦绋嬪崱鐨勭幓鐠冩槸鍚﹀埌榻� - */ + List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo); + List<DownWorkstation> queryWorkStationIsFull(); + + } -- Gitblit v1.8.0