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