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/downglassinfo/service/DownGlassInfoService.java | 19 ++++++++++++++++++-
1 files changed, 18 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 6e9c45d..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
@@ -60,9 +60,26 @@
*/
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