From 39c4a3e62f568976407b62620e7f6d95d35db53e Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Thu, 27 Nov 2025 09:50:52 +0800 Subject: [PATCH] 1.EBC版本 getProcessCardDataByCustomIdProductId 均增加sRowData参数 --- src/components/Common/CommonBill/index.js | 1 + src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js | 2 +- src/components/Manufacture/ProcessCardPackTableTreeNew/index.js | 2 +- src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js | 2 +- src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js | 2 +- src/components/Manufacture/WorkOrderPackTableTreeNew/index.js | 3 ++- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js index 6096a89..a6d9164 100644 --- a/src/components/Common/CommonBill/index.js +++ b/src/components/Common/CommonBill/index.js @@ -1300,6 +1300,7 @@ class CommonBill extends Component { const sProductIds = sProductIdArray.toString(); const condition = { sCustomerId, sProductIds, + sRowData: selectData, }; const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js index b8e87d0..45c34f5 100644 --- a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js +++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js @@ -2891,7 +2891,7 @@ class ProcessCardPackTableTree extends Component { } }); const sProductIds = sProductIdArray.toString(); - const condition = { sCustomerId, sProductIds }; + const condition = { sCustomerId, sProductIds, sRowData: copyTo.slaveData || [] }; const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; if (dataReturn.code === 1) { diff --git a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js index 2351077..004762f 100644 --- a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js +++ b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js @@ -1708,7 +1708,7 @@ const ProcessCardPackTableTreeNewEvent = props => { iSlaveIndex = slaveData.findIndex(item => item.sId === slaveSelectedRowKeys.toString()); } - const condition = { sCardId: selectData[0].sId }; + const condition = { sCardId: selectData[0].sId, sRowData: selectData }; const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; console.log('ddddataReturnd', dataReturn); diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js index d9d8983..55b1a29 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js @@ -2910,7 +2910,7 @@ class WorkOrderPack extends Component { } }); const sProductIds = sProductIdArray.toString(); - const condition = { sCustomerId, sProductIds }; + const condition = { sCustomerId, sProductIds, sRowData: copyTo.slaveData || [] }; const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; if (dataReturn.code === 1) { diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js index 1dd5cac..4a63013 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js @@ -2912,7 +2912,7 @@ class WorkOrderPack extends Component { } }); const sProductIds = sProductIdArray.toString(); - const condition = { sCustomerId, sProductIds }; + const condition = { sCustomerId, sProductIds, sRowData: copyTo?.slaveData || [] }; const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; if (dataReturn.code === 1) { diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js index 141ac23..102e9d4 100644 --- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js +++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js @@ -304,7 +304,8 @@ const WorkOrderPackTableTreeNewEvent = props => { console.log('copyTo', copyTo, sVerArray); const sProductIds = sProductIdArray.toString(); const sProductTechnologyVer =sVerArray.toString(); - const condition = { sCustomerId, sProductIds, sProductTechnologyVer }; + const sRowData = copyTo?.slaveData || []; + const condition = { sCustomerId, sProductIds, sProductTechnologyVer, sRowData}; const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; if (dataReturn.code === 1) { -- libgit2 0.22.2