From 300f0160a7304a3a35f2404e63212057b5ad7329 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 10 二月 2025 15:56:47 +0800
Subject: [PATCH] 上片模块工程号获取、暂停接口
---
UI-Project/config.js | 8 ++++----
UI-Project/src/views/Returns/upreturns.vue | 6 +++---
UI-Project/src/views/Returns/upreturns2.vue | 6 +++---
UI-Project/src/utils/constants.js | 3 ++-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 3 ++-
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index a4a8a52..b0fb835 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,11 +1,11 @@
export default {
// serverUrl: "10.153.19.150:88/api",
- serverUrl: "192.168.2.100:88/api",
-// serverUrl: "127.0.0.1:88",
+// serverUrl: "192.168.2.100:88/api",
+ serverUrl: "127.0.0.1:88",
// serverUrl: "192.168.0.39:88",
// serverUrl2: "10.153.19.150:88"
- serverUrl2: "192.168.2.100:88"
- // serverUrl2: "127.0.0.1:88"
+ // serverUrl2: "192.168.2.100:88"
+ serverUrl2: "127.0.0.1:88"
// serverUrl2: "192.168.0.39:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 936c57d..2cc5dd8 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,5 +1,6 @@
// export const WebSocketHost = "192.168.2.100";
// export const WebSocketHost = "192.168.0.39";
// export const WebSocketHost = "10.153.19.150";
-export const WebSocketHost = "192.168.2.100";
+// export const WebSocketHost = "192.168.2.100";
+export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 7033a51..f92f0fb 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -60,7 +60,7 @@
if (response.code === 200) {
tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
- window.localStorage.setItem('engineeringId', tableData[0].engineeringId)
+ window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
}
@@ -136,7 +136,7 @@
// 缁撴潫宸ョ▼
const deleteTask = async () => {
try {
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
@@ -197,7 +197,7 @@
const handleup = async () => {
try {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index edac597..c75bc53 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -60,7 +60,7 @@
if (response.code === 200) {
tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
- window.localStorage.setItem('engineeringId', tableData[0].engineeringId)
+ window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
}
@@ -136,7 +136,7 @@
// 缁撴潫宸ョ▼
const deleteTask = async () => {
try {
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
@@ -197,7 +197,7 @@
const handleup = async () => {
try {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
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 bdab52c..2dfbb4c 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
@@ -1,6 +1,7 @@
package com.mes.engineering.controller;
+
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
@@ -63,7 +64,7 @@
if(work){
return Result.build(200, "鎴愬姛", null);
}else {
- return Result.build(100, "鎴愬姛", null);
+ return Result.build(100, "澶辨晽", null);
}
}
--
Gitblit v1.8.0