xlyErp / xlyUmi

Commit 39c4a3e62f568976407b62620e7f6d95d35db53e

Authored by Min
1 parent 68d946eb

1.EBC版本 getProcessCardDataByCustomIdProductId 均增加sRowData参数

Inline Side-by-side
Showing 6 changed files with 7 additions and 5 deletions
src/components/Common/CommonBill/index.js
  View file @39c4a3e
... ... @@ -1300,6 +1300,7 @@ class CommonBill extends Component {
1300 1300 const sProductIds = sProductIdArray.toString();
1301 1301 const condition = {
1302 1302 sCustomerId, sProductIds,
  1303 + sRowData: selectData,
1303 1304 };
1304 1305 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
1305 1306 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
... ...
src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
  View file @39c4a3e
... ... @@ -2891,7 +2891,7 @@ class ProcessCardPackTableTree extends Component {
2891 2891 }
2892 2892 });
2893 2893 const sProductIds = sProductIdArray.toString();
2894   - const condition = { sCustomerId, sProductIds };
  2894 + const condition = { sCustomerId, sProductIds, sRowData: copyTo.slaveData || [] };
2895 2895 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
2896 2896 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
2897 2897 if (dataReturn.code === 1) {
... ...
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
  View file @39c4a3e
... ... @@ -1708,7 +1708,7 @@ const ProcessCardPackTableTreeNewEvent = props => {
1708 1708 iSlaveIndex = slaveData.findIndex(item => item.sId === slaveSelectedRowKeys.toString());
1709 1709 }
1710 1710  
1711   - const condition = { sCardId: selectData[0].sId };
  1711 + const condition = { sCardId: selectData[0].sId, sRowData: selectData };
1712 1712 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
1713 1713 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
1714 1714 console.log('ddddataReturnd', dataReturn);
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
  View file @39c4a3e
... ... @@ -2910,7 +2910,7 @@ class WorkOrderPack extends Component {
2910 2910 }
2911 2911 });
2912 2912 const sProductIds = sProductIdArray.toString();
2913   - const condition = { sCustomerId, sProductIds };
  2913 + const condition = { sCustomerId, sProductIds, sRowData: copyTo.slaveData || [] };
2914 2914 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
2915 2915 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
2916 2916 if (dataReturn.code === 1) {
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
  View file @39c4a3e
... ... @@ -2912,7 +2912,7 @@ class WorkOrderPack extends Component {
2912 2912 }
2913 2913 });
2914 2914 const sProductIds = sProductIdArray.toString();
2915   - const condition = { sCustomerId, sProductIds };
  2915 + const condition = { sCustomerId, sProductIds, sRowData: copyTo?.slaveData || [] };
2916 2916 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
2917 2917 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
2918 2918 if (dataReturn.code === 1) {
... ...
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
  View file @39c4a3e
... ... @@ -304,7 +304,8 @@ const WorkOrderPackTableTreeNewEvent = props => {
304 304 console.log('copyTo', copyTo, sVerArray);
305 305 const sProductIds = sProductIdArray.toString();
306 306 const sProductTechnologyVer =sVerArray.toString();
307   - const condition = { sCustomerId, sProductIds, sProductTechnologyVer };
  307 + const sRowData = copyTo?.slaveData || [];
  308 + const condition = { sCustomerId, sProductIds, sProductTechnologyVer, sRowData};
308 309 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
309 310 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
310 311 if (dataReturn.code === 1) {
... ...