From 9b987ee67106e89fb095b2b1e10a5842dc4f9d25 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Wed, 21 Aug 2024 18:51:27 +0800 Subject: [PATCH] =?UTF-8?q?HL-4935=20WMS=20WEB=E7=AB=AF=E9=A2=84=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptRecordMain/index.ts | 1 + src/locales/zh-CN.ts | 3 ++- .../productreceipt/productreceiptRecordMain/index.vue | 11 +++++++++-- .../productreceiptAssembleRecordMain/index.vue | 10 ++++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index d7637d4d0..29a791d91 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -25,6 +25,7 @@ export interface ProductreceiptRecordMainVO { toAreaTypes: string toAreaCodes: string available: string + inventoryStatus:string } // 查询制品收货记录主列表 diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 8a8b4a545..2387dbe25 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1277,7 +1277,8 @@ export default { 请输入联系电话:'请输入联系电话', 请选择范围:'请选择范围', '确认撤销报工吗？': "确认撤销报工吗？", - '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量' + '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量', + 撤销报工成功:'撤销报工成功', }, } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index aea579ff8..805c97f38 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -252,8 +252,15 @@ const labelRecovery = async (row) => { try { await message.confirm(t('ts.确认撤销报工吗？')) tableObject.loading = true - let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row) - message.success(t('ts.确认撤销报工成功')) + const params = ref({ + number: '', + inventoryStatus: '', + }) + params.number= row.number; + params.inventoryStatus= row.inventoryStatus; + + let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params); + message.success(t('ts.撤销报工成功')) } catch { } finally { tableObject.loading = false diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 26eead039..64c4af7c7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -281,8 +281,14 @@ const handleCreatePutawayRequest = async (number:string) => { const labelRecovery = async (row) => { try { await message.confirm(t('ts.确认撤销报工吗？')) - let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row) - message.success(t('ts.确认撤销报工成功')) + const params = ref({ + number: '', + inventoryStatus: '', + }) + params.number= row.number; + params.inventoryStatus= row.inventoryStatus; + let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params) + message.success(t('ts.撤销报工成功')) } catch { } finally { tableObject.loading = false