From 5a73b7ff0b5f063de61fd014feaa68d267630db9 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 15:31:01 +0800
Subject: [PATCH] fix(stockChat): 修复驼峰命名并添加调试日志
---
Code/WMS/WIDESEA_WMSClient/src/views/stock/stockChat.vue | 78 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockChat.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockChat.vue
index 0f7402e..fdb35a2 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockChat.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockChat.vue
@@ -59,8 +59,12 @@
import { ref, reactive, onMounted, onUnmounted, watch, getCurrentInstance } from 'vue'
import * as THREE from 'three'
import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'
+import * as signalR from '@microsoft/signalr'
const { proxy } = getCurrentInstance()
+
+// SignalR 杩炴帴
+let connection = null
// 棰滆壊甯搁噺
const COLOR_MAP = {
@@ -102,6 +106,39 @@
let locationData = []
let animationId = null
+// SignalR 鍒濆鍖�
+function initSignalR() {
+ proxy.http.post('api/User/GetCurrentUserInfo').then((result) => {
+ connection = new signalR.HubConnectionBuilder()
+ .withAutomaticReconnect()
+ .withUrl(`${proxy.http.ipAddress}stockHub?userName=${result.data.userName}`)
+ .build();
+
+ connection.start().catch((err) => console.log('SignalR杩炴帴澶辫触:', err));
+
+ connection.on('StockUpdated', (update) => {
+ // 鏇存柊瀵瑰簲璐т綅鐨勬暟鎹�
+ const idx = locationData.findIndex(x => x.locationId === update.locationId);
+ if (idx !== -1) {
+ locationData[idx].stockQuantity = update.stockQuantity;
+ locationData[idx].stockStatus = update.stockStatus;
+ // 閲嶆柊娓叉煋鍗曚釜璐т綅棰滆壊
+ updateInstanceColor(idx, update.stockStatus);
+ }
+ });
+ });
+}
+
+// 鏇存柊鍗曚釜璐т綅棰滆壊
+function updateInstanceColor(instanceId, stockStatus) {
+ if (!locationMesh) return;
+ const loc = locationData[instanceId];
+ if (!loc) return;
+ const color = getLocationColor(loc);
+ locationMesh.setColorAt(instanceId, new THREE.Color(color));
+ locationMesh.instanceColor.needsUpdate = true;
+}
+
// 鑾峰彇璐т綅棰滆壊
function getLocationColor(location) {
if (location.locationStatus === 3) return COLOR_MAP.DISABLED // 绂佺敤
@@ -131,10 +168,10 @@
async function loadWarehouseList() {
try {
const res = await proxy.http.get('/api/Warehouse/GetAll')
- if (res.Status && res.Data) {
- warehouseList.value = res.Data
- if (res.Data.length > 0) {
- activeWarehouse.value = res.Data[0].warehouseId || res.Data[0].id
+ if (res.status && res.data) {
+ warehouseList.value = res.data
+ if (res.data.length > 0) {
+ activeWarehouse.value = res.data[0].warehouseId || res.data[0].id
await loadWarehouseData(activeWarehouse.value)
}
}
@@ -147,17 +184,15 @@
async function loadWarehouseData(warehouseId) {
try {
const res = await proxy.http.get(`/api/StockInfo/Get3DLayout?warehouseId=${warehouseId}`)
- if (res.Status && res.Data) {
- locationData = res.Data
- // 鎻愬彇鐗╂枡缂栧彿鍜屾壒娆″垪琛�
- const codes = new Set()
- const batches = new Set()
- res.Data.forEach(loc => {
- if (loc.materielCode) codes.add(loc.materielCode)
- if (loc.batchNo) batches.add(loc.batchNo)
- })
- materielCodeList.value = Array.from(codes)
- batchNoList.value = Array.from(batches)
+ console.log('Get3DLayout response:', res)
+ if (res.status && res.data) {
+ const data = res.data
+ console.log('data.locations:', data.locations)
+ locationData = data.locations || []
+ // 浣跨敤鍚庣杩斿洖鐨勭瓫閫夊垪琛�
+ materielCodeList.value = data.materielCodeList || []
+ batchNoList.value = data.batchNoList || []
+ console.log('locationData set:', locationData.length, 'items')
// 娓叉煋璐т綅
renderLocations()
}
@@ -226,6 +261,7 @@
// 娓叉煋璐т綅
function renderLocations() {
+ console.log('renderLocations called', { scene: !!scene, locationDataLength: locationData.length })
if (!scene) return
// 绉婚櫎鏃х殑璐т綅缃戞牸
@@ -237,7 +273,7 @@
}
// 杩囨护鏁版嵁
- let filteredData = locationData
+ let filteredData = [...locationData]
if (filterStockStatus.value !== null) {
filteredData = filteredData.filter(loc => loc.stockStatus === filterStockStatus.value)
}
@@ -248,6 +284,7 @@
filteredData = filteredData.filter(loc => loc.batchNo === filterBatchNo.value)
}
+ console.log('filteredData length:', filteredData.length)
if (filteredData.length === 0) return
// 鍒涘缓 InstancedMesh
@@ -271,12 +308,17 @@
// 璁剧疆棰滆壊
color.setHex(getLocationColor(location))
locationMesh.setColorAt(i, color)
+
+ if (i === 0) {
+ console.log('First location:', location, { x, y, z })
+ }
})
locationMesh.instanceMatrix.needsUpdate = true
if (locationMesh.instanceColor) locationMesh.instanceColor.needsUpdate = true
scene.add(locationMesh)
+ console.log('locationMesh added to scene')
}
// 鍔ㄧ敾寰幆
@@ -386,6 +428,7 @@
onMounted(() => {
initThreeJS()
loadWarehouseList()
+ initSignalR()
window.addEventListener('resize', onWindowResize)
})
@@ -401,6 +444,9 @@
if (renderer) {
renderer.dispose()
}
+ if (connection) {
+ connection.stop()
+ }
})
</script>
--
Gitblit v1.9.3