diff --git a/src/views/modules/dashboard/picking-board.vue b/src/views/modules/dashboard/picking-board.vue index da0daba..6a252b4 100644 --- a/src/views/modules/dashboard/picking-board.vue +++ b/src/views/modules/dashboard/picking-board.vue @@ -79,9 +79,8 @@ No. 拣选托盘码 拣选物料名称 - 拣选数量 + RFID 状态 - 存放托盘码 存放位置 @@ -89,14 +88,13 @@ {{ idx + 1 }} {{ item.pickingBatchNo }} - {{ item.pickingMaterialName }} - {{ item.pickingQty }} + {{ item.pickingMaterialName }} + {{ item.rfidBarcode }} {{ item.status }} - {{ item.storageBatchNo }} {{ item.storageLocation }} diff --git a/src/views/modules/dashboard/robot-picking-board.vue b/src/views/modules/dashboard/robot-picking-board.vue index 47892bb..e1a8e7c 100644 --- a/src/views/modules/dashboard/robot-picking-board.vue +++ b/src/views/modules/dashboard/robot-picking-board.vue @@ -51,7 +51,7 @@ No. 拣选托盘码 拣选物料名称 - 拣选数量 + RFID 状态 存放托盘码 存放位置 @@ -61,8 +61,8 @@ {{ idx + 1 }} {{ item.pickingBatchNo }} - {{ item.pickingMaterialName }} - {{ item.pickingQty }} + {{ item.pickingMaterialName }} + {{ item.rfidBarcode }} {{ item.status }} @@ -96,9 +96,9 @@ No. 拣选托盘码 拣选物料名称 - 拣选数量 + 标签号 状态 - 存放托盘码 + 存放托盘码 存放位置 @@ -106,8 +106,8 @@ {{ idx + 1 }} {{ item.pickingBatchNo }} - {{ item.pickingMaterialName }} - {{ item.pickingQty }} + {{ item.pickingMaterialName }} + {{ item.rfidBarcode }} {{ item.status }} @@ -143,90 +143,12 @@ export default { // 周转箱拣选数据 containerPickingList: [ - { - pickingBatchNo: 'P00001', - pickingMaterialName: '80565653', - pickingQty: '1,000', - status: '分拣中', - storageBatchNo: 'P01100', - storageLocation: 'ZD01' - }, - { - pickingBatchNo: 'P00010', - pickingMaterialName: '80568657', - pickingQty: '5,000', - status: '等待分拣', - storageBatchNo: 'P01100', - storageLocation: 'ZD01' - }, - { - pickingBatchNo: 'P00012', - pickingMaterialName: '80505658', - pickingQty: '1,000', - status: '等待分拣', - storageBatchNo: 'P01100', - storageLocation: 'ZD01' - }, - { - pickingBatchNo: 'P00012', - pickingMaterialName: '80525659', - pickingQty: '1,000', - status: '等待分拣', - storageBatchNo: 'P01103', - storageLocation: 'ZD02' - }, - { - pickingBatchNo: 'P00033', - pickingMaterialName: '80542546', - pickingQty: '5,000', - status: '等待分拣', - storageBatchNo: 'P01103', - storageLocation: 'ZD02' - } + ], // 原材拣选数据 materialPickingList: [ - { - pickingBatchNo: 'G00001', - pickingMaterialName: '70000213', - pickingQty: '1,000', - status: '分拣中', - storageBatchNo: 'G01102', - storageLocation: 'ZD03' - }, - { - pickingBatchNo: 'G00010', - pickingMaterialName: '70000235', - pickingQty: '5,000', - status: '等待分拣', - storageBatchNo: 'G01102', - storageLocation: 'ZD03' - }, - { - pickingBatchNo: 'G00012', - pickingMaterialName: '70004562', - pickingQty: '1,000', - status: '等待分拣', - storageBatchNo: 'G01102', - storageLocation: 'ZD03' - }, - { - pickingBatchNo: 'G00012', - pickingMaterialName: '70004358', - pickingQty: '1,000', - status: '等待分拣', - storageBatchNo: 'W11003', - storageLocation: 'ZD04' - }, - { - pickingBatchNo: 'W00033', - pickingMaterialName: '70000220', - pickingQty: '5,000', - status: '等待分拣', - storageBatchNo: 'W11003', - storageLocation: 'ZD04' - } + ] } }, @@ -258,16 +180,39 @@ export default { methods: { /** * 获取数据列表 + * + *

功能说明:从后端API获取机械臂拣选实时数据

+ *

数据更新策略:覆盖而非追加,避免内存累积

*/ getDataList() { robotPicking({}).then(({data}) => { if (data && data.code === 200) { console.log('获取机械臂拣选数据成功:', data.data) - // TODO: 处理返回的数据,覆盖而非追加,避免内存累积 - // if (data.data) { - // this.containerPickingList = data.data.containerList || [] - // this.materialPickingList = data.data.materialList || [] - // } + + // 处理返回的数据 + if (data.data) { + // 周转箱拣选数据 (sortingStation=1071) + if (data.data.containerList && data.data.containerList.length > 0) { + this.containerPickingList = data.data.containerList + console.log('周转箱拣选数据已更新,共', this.containerPickingList.length, '条') + } else { + console.log('暂无周转箱拣选数据') + // 保持原有数据或清空,根据业务需求决定 + // this.containerPickingList = [] + } + + // 原材拣选数据 (sortingStation=1060) + if (data.data.materialList && data.data.materialList.length > 0) { + this.materialPickingList = data.data.materialList + console.log('原材拣选数据已更新,共', this.materialPickingList.length, '条') + } else { + console.log('暂无原材拣选数据') + // 保持原有数据或清空,根据业务需求决定 + // this.materialPickingList = [] + } + } + } else { + console.error('获取机械臂拣选数据失败: 返回码不正确') } }).catch(error => { console.error('获取机械臂拣选数据失败:', error)