From eabb757720375b74900027e23e50303b7e02ca36 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 09 十二月 2025 17:04:23 +0800
Subject: [PATCH] 添加nacos配置中心，可动态更新mes导入工程接口；修改Excel表数据转json格式
---
mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue b/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
index 8b669ce..3021519 100644
--- a/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
+++ b/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
@@ -323,7 +323,7 @@
return
}
- // 鍙戦�佹暟鎹埌 MES 鎺ュ彛
+ // 鍙戦�佹暟鎹�
submitGlassData(parsedData)
} catch (error) {
@@ -391,11 +391,6 @@
headerStr.includes('qty') || headerStr === '鏁伴噺') {
headerMap.quantity = index
}
- // 璁㈠崟鍙�
- else if (headerStr.includes('璁㈠崟') || headerStr.includes('order') ||
- headerStr.includes('orderno') || headerStr === '璁㈠崟鍙�') {
- headerMap.orderNumber = index
- }
// 鑶滅郴
else if (headerStr.includes('鑶滅郴') || headerStr.includes('films') ||
headerStr.includes('film') || headerStr === '鑶滅郴id') {
@@ -439,8 +434,6 @@
const height = row[headerMap.height] ? String(row[headerMap.height]).trim() : ''
const thickness = row[headerMap.thickness] ? String(row[headerMap.thickness]).trim() : ''
const quantity = row[headerMap.quantity] ? String(row[headerMap.quantity]).trim() : ''
- // 璁㈠崟搴忓彿锛堟帴鍙ｈ姹傛暣鏁帮紝杩欓噷灏濊瘯瑙ｆ瀽涓烘暣鏁帮紝涓嶅彲瑙ｆ瀽鍒欑疆绌猴級
- const orderNumber = parseInt(row[headerMap.orderNumber]) || ''
const filmsId = row[headerMap.filmsId] ? String(row[headerMap.filmsId]).trim() : ''
const flowCardId = row[headerMap.flowCardId] ? String(row[headerMap.flowCardId]).trim() : ''
const productName = row[headerMap.productName] ? String(row[headerMap.productName]).trim() : ''
@@ -476,7 +469,6 @@
height: parseNumber(height),
thickness: parseNumber(thickness),
quantity: '1', // 姣忔潯璁板綍鏁伴噺涓�1
- orderNumber: orderNumber,
filmsId: filmsId,
flowCardId: flowCardId || finalGlassId,
productName: productName,
@@ -506,8 +498,15 @@
const response = await engineeringApi.importEngineer(requestData)
- if (response?.code === 200 || response?.code === 0 || response?.data) {
- ElMessage.success(`鎴愬姛瀵煎叆 ${glassDataList.length} 鏉＄幓鐠冩暟鎹紝宸ョ▼鍙凤細${requestData.engineerId}`)
+ // 妫�鏌� MES 鎺ュ彛鏄惁璋冪敤鎴愬姛
+ // MES 鎺ュ彛鎴愬姛鏃惰繑鍥炴牸寮忥細{ code: 200/0, data: true/false, message: "..." }
+ if (response?.code === 200 || response?.code === 0) {
+ // MES 鎺ュ彛璋冪敤鎴愬姛
+ const engineerId = response?.data?.engineerId || response?.engineerId || ''
+ const successMsg = engineerId
+ ? `鎴愬姛瀵煎叆 ${glassDataList.length} 鏉＄幓鐠冩暟鎹紝宸ョ▼鍙凤細${engineerId}`
+ : `鎴愬姛瀵煎叆 ${glassDataList.length} 鏉＄幓鐠冩暟鎹甡
+ ElMessage.success(successMsg)
// 灏嗗鍏ョ殑鐜荤拑ID濉厖鍒拌緭鍏ユ锛屾柟渚跨敤鎴锋煡鐪嬪拰缂栬緫
const glassIds = glassDataList.map(item => item.glassId).filter(id => id)
@@ -515,13 +514,26 @@
glassIdsInput.value = glassIds.join('\n')
}
} else {
- throw new Error(response?.message || '瀵煎叆澶辫触')
+ // MES 鎺ュ彛杩斿洖澶辫触
+ throw new Error(response?.message || 'MES 鎺ュ彛杩斿洖澶辫触')
}
} catch (error) {
console.error('鎻愪氦鐜荤拑鏁版嵁澶辫触:', error)
- // 鏄剧ず閿欒淇℃伅
- const errorMsg = error?.response?.data?.message || error?.message || '鏈煡閿欒'
+ // 鍒ゆ柇閿欒绫诲瀷锛岀粰鍑烘洿鍙嬪ソ鐨勬彁绀�
+ let errorMsg = '鏈煡閿欒'
+
+ // 妫�鏌ユ槸鍚︽槸鍚庣杩斿洖鐨勯敊璇搷搴旓紙鍚庣杞彂 MES 澶辫触锛�
+ if (error?.response?.status === 500 && error?.response?.data) {
+ // 鍚庣杩斿洖鐨勭粺涓�閿欒鏍煎紡
+ errorMsg = error.response.data.message || error.response.data || '杞彂 MES 鎺ュ彛澶辫触'
+ } else if (error?.response?.data?.message) {
+ // MES 鎺ュ彛杩斿洖鐨勯敊璇�
+ errorMsg = error.response.data.message
+ } else if (error?.message) {
+ errorMsg = error.message
+ }
+
ElMessage.error('鎻愪氦鏁版嵁澶辫触: ' + errorMsg)
// 鍗充娇澶辫触锛屼篃灏濊瘯濉厖鐜荤拑ID鍒拌緭鍏ユ
--
Gitblit v1.8.0