From dbbf0c051ef05480a0becee07974b80e32b1cb8f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 20 五月 2025 11:38:31 +0800
Subject: [PATCH] 提交阿尔及及利亚项目改动

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
index ae005d6..b7e9966 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -7,6 +7,8 @@
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mes.common.config.Const;
+import com.mes.order.entity.dto.OrderDTO;
+import com.mes.order.service.OrdersService;
 import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
 import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
 import com.mes.rawglassstation.entity.RawGlassStorageStation;
@@ -37,6 +39,9 @@
     @Resource
     private RawGlassStorageDetailsService rawGlassStorageDetailsService;
 
+    @Resource
+    private OrdersService ordersService;
+
     @Scheduled(fixedDelay = 2000)
     public void sendRawGlassMessage() {
         log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
@@ -66,6 +71,10 @@
                 .orderByAsc(RawGlassStorageStation::getSlot);
         List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);
         jsonObject.append("rawGlassStorageDetailList", rawGlassStorageDetailList);
+
+        List<OrderDTO> orderDTOS = ordersService.selectOrderPercent();
+        jsonObject.append("orderDTOS", orderDTOS);
+
         List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
         if (CollectionUtil.isNotEmpty(sendwServer)) {
             sendwServer.stream().forEach(e -> {

--
Gitblit v1.8.0