s

ats/analysis/ATS_AIM_customer_data_analysis.js

@@ -459,7 +459,9 @@ try {
             var finish_size = tool.finish_size - 0
             if(matrix[layer].type == "laser_drill"){ 
                 drill_type = "laser"
-                layer_name = layer_name.replace("d", "l") }
+                var info_drilll = /[^\d]+(\d+)-(\d+)/.exec(layer_name);
+                layer_name = "l" + info_drilll[1] + "-" + info_drilll[2];
+            }
             if(matrix[layer].type == "bury_drill"){
                 drill_type = "via"
             }

ats/input/ATS_AIM_data_input.js

@@ -26,7 +26,7 @@ PARAMETER:
 	]
 	
  VERSION_HISTORY:
-	V1.00 2020-04-20 Scott Sun
+	V1.00 2020-05-18 Scott Sun
 	    1.新版本
 		
  HELP:
@@ -165,42 +165,30 @@ try {
 				if(err){throw err}
 				return tmp_job_name
 			})
-			var steps = [];
 			// 分析arr_job 和 pcs_job
-			jobs.forEach(function(jobname){
+			jobs = jobs.map(function(jobname){
 				GEN.openJob({job:jobname});
-				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 step_tmp = GEN.getStepList({job:jobname})[0]
+				var type = getStepType(step_tmp)
+				return {
+					jobname: jobname,
+					stepname:  step_tmp,
+					type: type
+				}
 			})
+
+			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/rename/ATS_AIM_data_format.js

@@ -62,7 +62,7 @@ try {
     var mode = "use" // develop
     var par = PAR;
 	if(!par.hasOwnProperty("config_path") || par.config_path==""){
-		console.log("==============cfg");
+		console.log("======== ======cfg");
 		par.config_path = "cam/input_data"
 	};
 	var db_customer = db.query("",function(q){