From f6195615cfceedfa1add7ffb762f76c1757545b9 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 14 五月 2025 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 e22f979..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("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
@@ -60,12 +65,16 @@
JSONObject jsonObject = new JSONObject();
MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>();
wrapper.select(RawGlassStorageStation::getSlot)
- .select(RawGlassStorageDetails::getRemainQuantity)
+ .select("ifnull(remain_quantity, 0) as remain_quantity")
.rightJoin(RawGlassStorageStation.class, on -> on.eq(RawGlassStorageStation::getSlot, RawGlassStorageDetails::getSlot)
.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN))
.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