From fc46ed525a74e09292c87ca2daa395f5ae6b22ff Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 29 十一月 2025 17:07:38 +0800
Subject: [PATCH] 1、因4号笼子划伤临时修改不进笼 2、大屏运行时间段最后一段缺失修改
---
UI-Project/src/views/largescreendisplay/timeaxis.vue | 12 ++++++++++++
UI-Project/src/views/largescreendisplay/screendisplay.vue | 5 ++---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 16 ++++++++--------
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml | 5 +++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 2 +-
5 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 6e81726..2e5d818 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1,7 +1,6 @@
<script setup>
import { onBeforeUnmount, onMounted, onUnmounted, ref, computed, nextTick, watch } from "vue";
import { useRouter } from "vue-router"
-import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import dayjs from 'dayjs';
@@ -1048,10 +1047,10 @@
</div>
<div style="width: 50%;">
<div class="img-screen" alt="Screen">
- <div>
+ <!-- <div>
<el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="exportToExcel()">{{
$t('large.statistics') }}</el-button>
- </div>
+ </div> -->
<!-- 閽㈠寲鍗婇�忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 315px;left: 130px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 87fbff6..206da1e 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -115,8 +115,20 @@
state: 2
});
}
+ if(index == tableDatax.value.length - 1){
+ tableData.push({
+ firstTimestamp: item.secondTimestamp,
+ secondTimestamp: item.endTimestamp,
+ diffMinutes: item.diffMinutes,
+ startTimestamp: item.startTimestamp,
+ endTimestamp: item.endTimestamp,
+ state: 1
+ });
+ }
});
}
+ console.log(tableData);
+
return tableData;
};
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index 442fbb7..d756bb7 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -256,13 +256,13 @@
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
- ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
- alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
- alarmInfo.setAlarmModule(ALARM_MODULE);
- alarmInfo.setAlarmType(ALARM_TYPE);
- alarmInfo.setAlarmCode(ALARM_CODE_OVER);
- alarmInfo.setAlarmMessage("");
- productAlarmInfoService.save(alarmInfo);
+// ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+// alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+// alarmInfo.setAlarmModule(ALARM_MODULE);
+// alarmInfo.setAlarmType(ALARM_TYPE);
+// alarmInfo.setAlarmCode(ALARM_CODE_OVER);
+// alarmInfo.setAlarmMessage("");
+// productAlarmInfoService.save(alarmInfo);
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
s7DataDLPOne = new S7DataDLPOne();
@@ -1011,7 +1011,7 @@
// if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
// 涓存椂瑙ｅ喅鏂规:鍑虹墖鏃惰�冭檻鐜荤拑纰版挒锛屾敼涓轰竴鐗囦竴鍑�
// 鐣岄潰鍏抽棴璋冨害寮�鍏� !Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType)
- if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 8) {
+ if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 7) {
outGlassList = list.subList(0, 1);
} else {
List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 7e0ea1d..c1f788d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -105,10 +105,10 @@
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
engineeringService.saveEngineering(listEngineering);
- log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
//灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
boolean work = engineeringService.changeTasks(engineering);
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+ log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
if (work) {
return Result.build(200, "淇濆瓨鎴愬姛" + engineering.getEngineerId(), true);
} else {
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
index 8637032..da8c932 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
@@ -19,6 +19,11 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+ sd:
+ url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
--
Gitblit v1.8.0