发料 生产收料 上线结算 生产退料 生产计划 --主子表合并更换id

src/views/wms/issueManage/issue/issueJobMain/index.vue

@@ -270,11 +270,11 @@ const buttonTableClick = async (val, row) => {
     }
     IssueJobMainApi.executeIssueMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    IssueJobMainApi.abandonIssueMain(row.id)
+    IssueJobMainApi.abandonIssueMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    IssueJobMainApi.closeIssueMain(row.id)
+    IssueJobMainApi.closeIssueMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    IssueJobMainApi.acceptIssueMain(row.id)
+    IssueJobMainApi.acceptIssueMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/issueManage/issue/issueRequestMain/index.vue

@@ -218,7 +218,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    IssueRequestMainApi.close(row.id).then(() => {
+    IssueRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -229,7 +229,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    IssueRequestMainApi.reAdd(row.id).then(() => {
+    IssueRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -240,7 +240,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    IssueRequestMainApi.submit(row.id).then(() => {
+    IssueRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -251,7 +251,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    IssueRequestMainApi.refused(row.id).then(() => {
+    IssueRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -262,7 +262,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    IssueRequestMainApi.agree(row.id).then(() => {
+    IssueRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -273,7 +273,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    IssueRequestMainApi.handle(row.id).then(() => {
+    IssueRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -284,7 +284,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue

@@ -271,11 +271,11 @@ const buttonTableClick = async (val, row) => {
     }
     ProductionreceiptJobMainApi.executeIssueMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductionreceiptJobMainApi.abandonIssueMain(row.id)
+    ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    ProductionreceiptJobMainApi.closeIssueMain(row.id)
+    ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    ProductionreceiptJobMainApi.acceptIssueMain(row.id)
+    ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue

@@ -243,11 +243,11 @@ const buttonTableClick = async (val, row) => {
     }
     ProductionreturnJobMainApi.executeProductionreturnMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductionreturnJobMainApi.abandonProductionreturnMain(row.id)
+    ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    ProductionreturnJobMainApi.closeProductionreturnMain(row.id)
+    ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    ProductionreturnJobMainApi.acceptProductionreturnMain(row.id)
+    ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -330,7 +330,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainApi.close(row.id).then(() => {
+    ProductionreturnRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -341,7 +341,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainApi.reAdd(row.id).then(() => {
+    ProductionreturnRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -352,7 +352,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainApi.submit(row.id).then(() => {
+    ProductionreturnRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainApi.refused(row.id).then(() => {
+    ProductionreturnRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -374,7 +374,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainApi.agree(row.id).then(() => {
+    ProductionreturnRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     detatableData.params = {
-      masterId:row.id
+      masterId:row.masterId
     }
     await getDetailList()
     // 打开创建标签页面
@@ -467,7 +467,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    ProductionreturnRequestMainApi.handle(row.id).then(() => {
+    ProductionreturnRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -478,7 +478,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   } else if (val == 'point') { // 标签打印
     handlePoint(row)
   }

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -323,7 +323,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainNoApi.close(row.id).then(() => {
+    ProductionreturnRequestMainNoApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -334,7 +334,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainNoApi.reAdd(row.id).then(() => {
+    ProductionreturnRequestMainNoApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainNoApi.submit(row.id).then(() => {
+    ProductionreturnRequestMainNoApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainNoApi.refused(row.id).then(() => {
+    ProductionreturnRequestMainNoApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -367,7 +367,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductionreturnRequestMainNoApi.agree(row.id).then(() => {
+    ProductionreturnRequestMainNoApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -390,7 +390,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     detatableData.params = {
-      masterId:row.id
+      masterId:row.masterId
     }
     await getDetailList()
     // 打开创建标签页面
@@ -460,7 +460,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    ProductionreturnRequestMainNoApi.handle(row.id).then(() => {
+    ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -471,7 +471,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   } else if (val == 'point') { // 标签打印
     handlePoint(row)
   }

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -238,7 +238,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    await ProductionMainApi.open(row.id).then(() => {
+    await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -249,7 +249,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    await ProductionMainApi.close(row.id).then(() => {
+    await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -261,7 +261,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.id).then(() => {
+    await ProductionMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -272,7 +272,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    await ProductionMainApi.reject(row.id).then(() => {
+    await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -284,7 +284,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    await ProductionMainApi.agree(row.id).then(() => {
+    await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -297,7 +297,7 @@ const buttonTableClick = async (val, row) => {
     await message.confirm('确认要发布吗？')
     // 物料含有不可用时 是否继续执行
     let isAvailable = true
-    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+    await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
       if (res.length > 0) {
         let rs = ''
         res.forEach(item => {
@@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    await ProductionMainApi.publish(row.id).then(() => {
+    await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -323,7 +323,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    await ProductionMainApi.resetting(row.id).then(() => {
+    await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
   
 }

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    await ProductionMainApi.open(row.id).then(() => {
+    await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -248,7 +248,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    await ProductionMainApi.close(row.id).then(() => {
+    await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -260,7 +260,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.id).then(() => {
+    await ProductionMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    await ProductionMainApi.reject(row.id).then(() => {
+    await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -283,7 +283,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    await ProductionMainApi.agree(row.id).then(() => {
+    await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -296,7 +296,7 @@ const buttonTableClick = async (val, row) => {
     await message.confirm('确认要发布吗？')
     // 物料含有不可用时 是否继续执行
     let isAvailable = true
-    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+    await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
       if (res.length > 0) {
         let rs = ''
         res.forEach(item => {
@@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    await ProductionMainApi.publish(row.id).then(() => {
+    await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    await ProductionMainApi.resetting(row.id).then(() => {
+    await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
   
 }

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    await ProductionMainApi.open(row.id).then(() => {
+    await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -248,7 +248,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    await ProductionMainApi.close(row.id).then(() => {
+    await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -260,7 +260,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.id).then(() => {
+    await ProductionMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    await ProductionMainApi.reject(row.id).then(() => {
+    await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -283,7 +283,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    await ProductionMainApi.agree(row.id).then(() => {
+    await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -296,7 +296,7 @@ const buttonTableClick = async (val, row) => {
     await message.confirm('确认要发布吗？')
     // 物料含有不可用时 是否继续执行
     let isAvailable = true
-    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+    await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
       if (res.length > 0) {
         let rs = ''
         res.forEach(item => {
@@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    await ProductionMainApi.publish(row.id).then(() => {
+    await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    await ProductionMainApi.resetting(row.id).then(() => {
+    await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
   
 }

src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

@@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    await ProductionMainApi.open(row.id).then(() => {
+    await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -248,7 +248,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    await ProductionMainApi.close(row.id).then(() => {
+    await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -260,7 +260,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    await ProductionMainApi.submit(row.id).then(() => {
+    await ProductionMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    await ProductionMainApi.reject(row.id).then(() => {
+    await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -283,7 +283,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    await ProductionMainApi.agree(row.id).then(() => {
+    await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -296,7 +296,7 @@ const buttonTableClick = async (val, row) => {
     await message.confirm('确认要发布吗？')
     // 物料含有不可用时 是否继续执行
     let isAvailable = true
-    await ProductionMainApi.getProductionDetail(row.id).then(async res =>{
+    await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
       if (res.length > 0) {
         let rs = ''
         res.forEach(item => {
@@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    await ProductionMainApi.publish(row.id).then(() => {
+    await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    await ProductionMainApi.resetting(row.id).then(() => {
+    await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
   
 }