s

ats/input/ATS_AIM_data_input.js

@@ -165,30 +165,42 @@ try {
 				if(err){throw err}
 				return tmp_job_name
 			})
+			var steps = [];
 			// 分析arr_job 和 pcs_job
-			jobs = jobs.map(function(jobname){
+			jobs.forEach(function(jobname){
 				GEN.openJob({job:jobname});
-				var step_tmp = GEN.getStepList({job:jobname})[0]
-				var type = getStepType(step_tmp)
-				return {
-					jobname: jobname,
-					stepname:  step_tmp,
-					type: type
-				}
+				var steps = GEN.getStepList({job:jobname})
+				steps.forEach(function(stepname){
+					var type = getStepType(stepname) // pcs arr
+					if(type == "pcs"){
+						steps.unshift({
+							jobname: jobname,
+							stepname:  stepname,
+							type: type
+						})
+					}
+					if(type == "arr"){
+						steps.push({
+							jobname: jobname,
+							stepname:  stepname,
+							type: type
+						})
+					}
+				})
+			})
+			GEN.createJob({name:job,db:custCfg.db})
+			steps.forEach(function(item){
+				GEN.copyStep({  // 合并
+					source_job:item.jobname,
+					source_name:item.stepname,
+					dest_job:job,
+					dest_name:item.stepname,
+				});
+			})
+			jobs.forEach(function(v){
+				GEN.closeJob({ job: v });
+				GEN.deleteJob({ job: v });  // 合并后 删除array的料号
 			})
-
-			var pcs_job = jobs.filter(function(v){return v.type == "pcs"})[0]
-			var arr_job = jobs.filter(function(v){return v.type == "arr"})[0]
-			GEN.copyStep({  // 合并
-				source_job:arr_job.jobname,
-				source_name:arr_job.stepname,
-				dest_job:pcs_job.jobname,
-				dest_name:arr_job.stepname,
-			});
-			GEN.closeJob({ job: arr_job.jobname });
-			GEN.deleteJob({ job: arr_job.jobname });  // 合并后 删除array的料号
-			// 修改pcs料号名称
-			GEN.COM("rename_entity,job=,is_fw=no,type=job,fw_type=form,name="+pcs_job.jobname+",new_name="+job)
 		}
 		importOk = true
 	}

ats/input/ATS_AIM_input_data.js

@@ -138,9 +138,9 @@ try {
 		})
 	});
 	var job_file_baseName = job
-	if(vc_position && vc_position != "" && !(/null/ig.test(vc_position))){
-		job_file_baseName = job_file_baseName + "_" + vc_position
-	}
+	// if(vc_position && vc_position != "" && !(/null/ig.test(vc_position))){
+	// 	job_file_baseName = job_file_baseName + "_" + vc_position
+	// }
 	var jobFile = pathInfo.filter(function(v){return v.baseName.toLowerCase() == job_file_baseName})
 	if(jobFile.length == 0){throw "job file is not exist"}
 	var jobFiles = []  // 记录要分析的文件
@@ -160,9 +160,10 @@ try {
 		} else {  // 多个tgz文件 说明需要合并
 			console.log("==========合并的情况");
 			var jobs = jobInfo.data.map(function(item, i){
-				var err = importJob({name:job + "_tmp_" + i,db:custCfg.db,path:item.file.path},config.delSameJob)
+				var tmp_job_name = job + "_tmp_" + i
+				var err = importJob({name:tmp_job_name,db:custCfg.db,path:item.file.path},config.delSameJob)
 				if(err){throw err}
-				return job + "_tmp_" + i
+				return tmp_job_name
 			})
 			// 分析arr_job 和 pcs_job
 			jobs = jobs.map(function(jobname){

test/scott_test.js

@@ -54,7 +54,6 @@ if ($.hasOwnProperty('script_parameter')){
 }
 
 try {
-	
     QDfm.updateRow({
 		table: "pdm_aimdfm_task",
 		data: {