Commit 908a02abc172ca7e31df720ba58c432aa9234384

Authored by Min
1 parent 20239b4f

1.订单生成工单 增加sProductTechnologyVer

src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
@@ -290,14 +290,21 @@ const WorkOrderPackTableTreeNewEvent = props => { @@ -290,14 +290,21 @@ const WorkOrderPackTableTreeNewEvent = props => {
290 if (bCkxCopyFromTechnology === "1" && !bCopyFromProcessCard) { 290 if (bCkxCopyFromTechnology === "1" && !bCopyFromProcessCard) {
291 const sCustomerId = commonUtils.isEmptyStr(copyTo.masterData.sCustomerId) ? copyTo.slaveData[0].sCustomerId : copyTo.masterData.sCustomerId; 291 const sCustomerId = commonUtils.isEmptyStr(copyTo.masterData.sCustomerId) ? copyTo.slaveData[0].sCustomerId : copyTo.masterData.sCustomerId;
292 const sProductIdArray = []; 292 const sProductIdArray = [];
  293 + const sVerArray = [];
293 copyTo.slaveData.forEach(slaveItem => { 294 copyTo.slaveData.forEach(slaveItem => {
294 const sProductId = slaveItem.sProductId; 295 const sProductId = slaveItem.sProductId;
295 if (commonUtils.isNotEmptyStr(sProductId)) { 296 if (commonUtils.isNotEmptyStr(sProductId)) {
296 sProductIdArray.push(sProductId); 297 sProductIdArray.push(sProductId);
297 } 298 }
  299 + const sVerStr = slaveItem.sProductTechnologyVer;
  300 + if (commonUtils.isNotEmptyStr(sVerStr)) {
  301 + sVerArray.push(sVerStr);
  302 + }
298 }); 303 });
  304 + console.log('copyTo', copyTo, sVerArray);
299 const sProductIds = sProductIdArray.toString(); 305 const sProductIds = sProductIdArray.toString();
300 - const condition = { sCustomerId, sProductIds }; 306 + const sProductTechnologyVer =sVerArray.toString();
  307 + const condition = { sCustomerId, sProductIds, sProductTechnologyVer };
301 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`; 308 const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
302 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data; 309 const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
303 if (dataReturn.code === 1) { 310 if (dataReturn.code === 1) {