From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..e921817 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> {
@@ -60,7 +61,25 @@
String setDownGlassInfoRequest(DownGlassInfoRequest request);
/**
- * 鏌ヨ鏋跺瓙涓婄粦瀹氭祦绋嬪崱鐨勭幓鐠冩槸鍚﹀埌榻�
+ * 娴佺▼鍗℃墦鍗版煡璇�
+ *
+ * @param downGlassInfo
+ * @return
+ */
+ List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo);
+
+ /**
+ * 宸ヤ綅鏄惁婊℃灦鏌ヨ
+ *
+ * @return
*/
List<DownWorkstation> queryWorkStationIsFull();
+
+ /**
+ * 鏍囩鎵撳嵃鏌ヨ
+ *
+ * @param downGlassInfo
+ * @return
+ */
+ List<Map<String, Object>> downGlassLabelPrint(DownGlassInfo downGlassInfo);
}
--
Gitblit v1.8.0