From e08c30f6a36a15be4e019b5e0d631f32f6d06029 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 24 十一月 2025 14:51:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 2c460ac..513676b 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -230,17 +230,17 @@
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
jsonObject.append("inkageEntity", inkageEntity);
//杩涚墖璇锋眰
- String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
jsonObject.append("requestEntity", requestEntity);
//鍚姩鍛戒护
- String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+ Integer mesReplyEntity = s7DataZKDLPOne.getMesReply();
jsonObject.append("mesReplyEntity", mesReplyEntity);
//鍑虹墖鑱旀満
- String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
+ Boolean outInkageEntity = s7DataZKDLPTwo.getMesControl();
jsonObject.append("outInkageEntity", outInkageEntity);
//鍑虹墖璇锋眰
- String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
- jsonObject.append("outInkageEntity", outInkageEntity);
+ Integer outRequestEntity = s7DataZKDLPTwo.getRequestMes();
+ jsonObject.append("outRequestEntity", outRequestEntity);
//930绌洪棽淇″彿
jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
//931绌洪棽淇″彿
@@ -336,7 +336,7 @@
jsonObject.append("bigStorageCageUsageSummary", bigStorageCageUsageSummary);
//缂虹墖璇︽儏
- List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard();
+ List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryAllLackByFlowCard();
jsonObject.append("lackDetailsList", lackDetailsList);
jsonObject.append("alarmInfo", productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>()
--
Gitblit v1.8.0