From fcb8b8cc392b146aa11bbaab9e497f7f13f29d44 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 26 五月 2025 11:38:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowequipmenthree.vue | 1
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 1
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 5 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml | 11 +++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 8 ++--
UI-Project/src/views/hollow/hollowequipment.vue | 3 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 11 +++++
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 1
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 11 +++++
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml | 10 +++++
10 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index e9c2807..4ae5acc 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -212,6 +212,11 @@
}
};
const handleEdit = (row) => {
+ patternWidth.value = row.patternWidth;
+ patternHeight.value = row.patternHeight;
+ patternThickness.value = row.patternThickness;
+ filmsId.value = row.filmsId;
+ remainQuantity.value = row.remainQuantity;
window.localStorage.setItem('deviceId', row.deviceId)
window.localStorage.setItem('slot', row.slot)
Edit.value = true;
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 27bb9b6..5b66a71 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -121,6 +121,7 @@
</el-table-column>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
<el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -1109,7 +1110,7 @@
5: t('hellow.intervalFrameTypea')
}
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
-function handleEdit(row) {
+function handleEdit(row) {
window.localStorage.setItem('id', row.id)
formulaName.value = row.formulaName;
filmRemove.value = removalMethodMap[row.filmRemove];
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index 3a4fa07..eca1b97 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -95,6 +95,7 @@
</el-table-column>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
<el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 33e4597..80972b3 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -95,6 +95,7 @@
</el-table-column>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
<el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
index 563cca9..b7ffd2c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
@@ -30,6 +30,17 @@
host: 127.0.0.1
port: 6379
password: 123456
+
+kangaroohy:
+ milo:
+ enabled: true
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://10.153.19.150:49320
+ security-policy: basic256sha256
+ username: admin
+ password: 1qaz2wsx3edc4rfv
kangaroohy:
milo:
enabled: true
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 c1653c5..7ffca65 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
@@ -87,7 +87,7 @@
@Resource
private RedisUtil redisUtil;
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
@@ -268,7 +268,7 @@
miloService.writeToOpcWord(list);
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
@@ -395,7 +395,7 @@
return;
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
@@ -484,7 +484,7 @@
miloService.writeToOpcWord(list);
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
index 25a2304..cefe8a2 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -26,6 +26,17 @@
host: 127.0.0.1
port: 6379
password: 123456
+
+kangaroohy:
+ milo:
+ enabled: true
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://10.153.19.150:49320
+ security-policy: basic256sha256
+ username: admin
+ password: 1qaz2wsx3edc4rfv
kangaroohy:
milo:
enabled: true
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index 36c5ff7..bb1d5c2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -31,6 +31,17 @@
host: 127.0.0.1
port: 6379
password: 123456
+
+kangaroohy:
+ milo:
+ enabled: true
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://10.153.19.150:49320
+ security-policy: basic256sha256
+ username: admin
+ password: 1qaz2wsx3edc4rfv
kangaroohy:
milo:
enabled: true
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
index 8bdeda7..47cec31 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
@@ -33,7 +33,6 @@
@Resource
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
-
@ApiOperation("棰嗗彇浠诲姟")
@PostMapping("/receiveTask")
public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
index c0bcd39..18045e8 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
@@ -28,6 +28,16 @@
host: 127.0.0.1
port: 6379
password: 123456
+ kangaroohy:
+ milo:
+ enabled: true
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://10.153.19.150:49320
+ security-policy: basic256sha256
+ username: admin
+ password: 1qaz2wsx3edc4rfv
kangaroohy:
milo:
enabled: true
--
Gitblit v1.8.0