From c63a72a68bc6739f3617a00bc15a187b59f06bae Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 十月 2024 15:53:21 +0800
Subject: [PATCH] 1、解决引入milo-spring-boot-starter依赖系统无法启动异常 2、opc服务可配置开关服务,避免无opc环境下系统启动报错 3、删除无用的opc代码

---
 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