From 22154be5e06873282b1b5a4a31ad43fea0d2c48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 11 May 2026 15:53:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms/report/template):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8D=B7=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将原有的coilIds查询参数替换为正确的actionIds来获取对应卷数据,修正了上报模板中待处理动作的查询逻辑 --- klp-ui/src/views/wms/report/template/action.vue | 3 ++- klp-ui/src/views/wms/report/template/merge.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue index 8124bac4..2c39118e 100644 --- a/klp-ui/src/views/wms/report/template/action.vue +++ b/klp-ui/src/views/wms/report/template/action.vue @@ -466,6 +466,7 @@ export default { const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 }); // 获取两层数据 const lossIds = res.rows.filter(item => item.coilId).map(item => item.coilId); + const lossActionIds = res.rows.filter(item => item.actionId).map(item => item.actionId); // 使用new Set去重 const outIds = [...new Set(res.rows.filter(item => item.processedCoilIds).map(item => item.processedCoilIds))]; @@ -479,7 +480,7 @@ export default { } const [lossRes, outRes] = await Promise.all([ - listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '', startTime: '', endTime: '' }), + listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '' }), listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }), ]); diff --git a/klp-ui/src/views/wms/report/template/merge.vue b/klp-ui/src/views/wms/report/template/merge.vue index 077e540f..f770b22c 100644 --- a/klp-ui/src/views/wms/report/template/merge.vue +++ b/klp-ui/src/views/wms/report/template/merge.vue @@ -240,6 +240,7 @@ export default { const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 }); // 获取两层数据 const lossIds = res.rows.map(item => item.coilId); + const lossActionIds = res.rows.map(item => item.actionId); // 使用new Set去重 const outIds = [...new Set(res.rows.map(item => item.processedCoilIds))]; @@ -253,7 +254,7 @@ export default { } const [lossRes, outRes] = await Promise.all([ - listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '', startTime: '', endTime: '' }), + listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '' }), listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }), ]); this.lossList = lossRes.rows.map(item => {