From 6fc113e0fd5e792350e286ad24a83bcd8d4b4b3b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 15:56:07 +0800
Subject: [PATCH] 更新界面显示问题
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 5 +-
UI-Project/config.js | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json | 66 ++++++++++++++++----------------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 6 +--
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 4 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 13 +++++-
8 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index f90b8ec..2dfd4e0 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,5 +1,5 @@
export default {
- serverUrl: "127.0.0.1:88/api",
+ serverUrl: "10.153.19.150:88/api",
serverUrl2: "10.153.19.150:88"
//serverUrl:"res.abeim.cn"
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 0d44280..6f605ad 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -100,7 +100,8 @@
const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
- flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_id }));
+ flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_Id }));
+ console.log(flowCardOptions.value)
} else {
ElMessage.error(response.msg);
}
@@ -198,7 +199,7 @@
-initWebSocket();
+// initWebSocket();
onMounted(fetchTableData);
// setInterval(fetchTableData, 2000)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
index 09e0a3a..5543ab5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
@@ -5,8 +5,7 @@
import org.springframework.data.annotation.Id;
import org.springframework.stereotype.Component;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+
import java.io.Serializable;
/**
@@ -27,8 +26,7 @@
/**
* 涓嬬墖鐜荤拑淇℃伅琛╥d
*/
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+
private Long id;
/**
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 583e283..5737bd6 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -35,7 +35,7 @@
@GetMapping("/selectStorageCage")
@ResponseBody
public Result selectDownStorageCage () {
- List<Map<String, Object>> list=downStorageCageDetailsService.getCacheInfo();
+ List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
return Result.build(200,"鎴愬姛",list);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
index 760b05a..e71747d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -55,4 +55,8 @@
*淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
*/
boolean updateDownStorageCageDetails(int downStorageCageId,DownStorageCageDetails downStorageCageDetails);
+ List<Map<String, Object>> selectDownStorageCages();
+
}
+
+
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index c15f867..ca5df21 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -238,9 +238,18 @@
}
+ @Override
+ public List<Map<String, Object>> selectDownStorageCages() {
+ return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)
+ .selectAll(DownStorageCage.class)
+ .selectAs(DownStorageCageDetails::getId, "esdId")
+ .select(DownStorageCageDetails::getGlassId, DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getId)
+ .leftJoin(DownStorageCageDetails.class, on -> on
+ .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
+ );
-
-
+ }
/**
* 淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愬惎鐢�/绂佺敤銆�
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
index 0e16b57..d44cf10 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
@@ -4,7 +4,7 @@
"dataType": "word",
"parameteInfor": [
{
- "codeId": "PLC鍗у紡鐞嗙墖浠诲姟璇锋眰瀛�",
+ "codeId": "RequestWord",
"addressIndex": "0",
"addressLenght": "2"
},
@@ -14,57 +14,57 @@
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "4",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "6",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "8",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "10",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "12",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "14",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "16",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "18",
"addressLenght": "2"
},
{
- "codeId": "MES浠诲姟鍙戦�佸瓧",
+ "codeId": "MESSendingWord",
"addressIndex": "20",
"addressLenght": "2"
},
{
- "codeId": "杩涚墖鏍煎瓙",
+ "codeId": "InputGrid",
"addressIndex": "22",
"addressLenght": "2"
},
{
- "codeId": "鍑虹墖鏍煎瓙",
+ "codeId": "OutputGrid",
"addressIndex": "24",
"addressLenght": "2"
},
@@ -79,67 +79,67 @@
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "30",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "32",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "34",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "36",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "38",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "40",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "42",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "44",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "46",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "48",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "50",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "52",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "54",
"addressLenght": "2"
},
@@ -149,7 +149,7 @@
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "58",
"addressLenght": "2"
},
@@ -189,12 +189,12 @@
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "74",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "76",
"addressLenght": "2"
},
@@ -234,27 +234,27 @@
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "92",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "94",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "96",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "98",
"addressLenght": "2"
},
{
- "codeId": "澶囩敤",
+ "codeId": "spare",
"addressIndex": "100",
"addressLenght": "2"
},
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 271fd98..c382433 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -56,7 +56,7 @@
@Test
public void testCacheGlass() {
- List<Map<String, Object>> map = downStorageCageDetailsServiceImpl.getCacheInfo();
+ List<Map<String, Object>> map = downStorageCageServiceImpl.selectDownStorageCages();
log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
}
--
Gitblit v1.8.0