From 0d35ca6cbe31b2cb2010b66b086acc1cb19ae270 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 四月 2024 11:50:21 +0800
Subject: [PATCH] 修改接口路径
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 10 +++++-----
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java | 5 ++++-
UI-Project/config.js | 2 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 2 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 2 +-
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index c067b2e..dc510d3 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,5 +1,5 @@
export default {
serverUrl: "localhost:8085",
- serverUrl2: "localhost:8085/mesModuleTools"
+ serverUrl2: "localhost:8085"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 04dc378..1bcac06 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -99,7 +99,7 @@
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
try {
- const response = await unloadrequest.get('/api/downWorkstation/getflowCardId');
+ const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId');
console.log(response)
if (response.code === 200) {
flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
@@ -113,7 +113,7 @@
//纭
const handleConfirm = async () => {
try {
- const response = await unloadrequest.post('/api/downWorkstation/updateFlowCardId', {
+ const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', {
workstationId: workstationId.value,
flowCardId: flowCardId.value
});
@@ -147,7 +147,7 @@
//娓呴櫎鍐呭
const handleclear = async () => {
try {
- const response = await unloadrequest.post('/api/downWorkstation/clear', {
+ const response = await unloadrequest.post('/api/unLoadGlass/clear', {
workstationId: workstationId.value,
});
@@ -180,7 +180,7 @@
const fetchTableData = async () => {
try {
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- const response = await unloadrequest.get('/api/downWorkstation/getone');
+ const response = await unloadrequest.get('/api/unLoadGlass/getone');
// 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
@@ -202,7 +202,7 @@
initWebSocket();
onMounted(fetchTableData);
-//setInterval(fetchTableData, 2000)
+setInterval(fetchTableData, 2000)
const open = () => {
ElMessageBox.confirm(
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 9ff8dbc..8788d0e 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -23,7 +23,7 @@
*/
@RestController
-@RequestMapping("/api/downWorkstation")
+@RequestMapping("/api/unLoadGlass")
public class DownWorkstationController {
@Autowired
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
index ad9296c..c0b4824 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
@@ -1,6 +1,7 @@
package com.mes.downworkstation.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import lombok.Data;
@@ -52,8 +53,10 @@
private Integer workState;
- private Integer total_quantity;
+ @TableField("total_quantity")
+ private Integer totalquantity;
+ @TableField("racks_number")
private Integer Racksnumber;
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 6e07df0..2752c15 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -37,7 +37,7 @@
.eq("workstation_id", workstationId);
DownWorkstation result = baseMapper.selectOne(queryWrapper);
- return result != null ? result.getTotal_quantity() : 0;
+ return result != null ? result.getTotalquantity() : 0;
}
// @Override
--
Gitblit v1.8.0