s

ats/input/ATS_AIM_data_input.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){

config_ats.js

@@ -267,8 +267,8 @@
 				}
 			],
 			"tl_name": [
-				{"orig_name" : ["top_enig"], "tl_name" : "top_enig" }, 
-				{"orig_name" : ["bot_enig"], "tl_name" : "bot_enig" }, 
+				{"orig_name" : ["top_enig","top-enig","enig_top"], "tl_name" : "enig_top" }, 
+				{"orig_name" : ["bot_enig","bot-enig","enig_bot"], "tl_name" : "enig_bot" }, 
 				{"orig_name" : ["^spt$","^past_top$"], "tl_name" : "past_top" }, 
 				{"orig_name" : ["^spb$","^past_botm$"], "tl_name" : "past_botm" },
 				{"orig_name" : ["^sst$","^silk_top$"], "tl_name" : "silk_top" },
@@ -419,8 +419,8 @@
 				{"orig_name" : "fab.art", "tl_name" : "fab.art" },
 				{"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" },
 				{"orig_name" : ["^outline"], "tl_name" : "outline" },
-				{"orig_name" : ["top-enig","top_enig"], "tl_name" : "top_enig" },
-				{"orig_name" : ["bot-enig","bot_enig"], "tl_name" : "bot_enig" },
+				{"orig_name" : ["top-enig","enig_top"], "tl_name" : "enig_top" },
+				{"orig_name" : ["bot-enig","enig_bot"], "tl_name" : "enig_bot" },
 			]
 		},
 		"New_data": {
@@ -548,19 +548,19 @@
 		}
 	},
 	"data_format": [
-		{"tl_name":"top_enig" , "new_name":"top_enig" , "attr":{ "context":"board", "type":"document" }},
+		{"tl_name":"enig_top" , "new_name":"enig_top" , "attr":{ "context":"board", "type":"document" }},
 		{"tl_name":"past_top" , "new_name":"past_top" , "attr":{ "context":"board", "type":"solder_paste" }},
 		{"tl_name":"silk_top" , "new_name":"silk_top" , "attr":{ "context":"board", "type":"silk_screen" }},
 		{"tl_name":"sm_top" , "new_name":"sm_top" , "attr":{ "context":"board", "type":"solder_mask" }},
 		{"tl_name":"^top$" , "new_name":"top" , "attr":{ "context":"board", "type":"signal" }},
-		{"tl_name":"l_(\\d+)","new_name":"layer_($1)" ,"attr":{"context":"board","type":"signal"}},
+		{"tl_name":"l_(\\d+)","new_name":"l($1)" ,"attr":{"context":"board","type":"signal"}},
 		{"tl_name":"^bottom$","new_name":"bottom" ,"attr":{"context":"board","type":"signal"}},
 		{"tl_name":"sm_botm" , "new_name":"sm_botm" , "attr":{ "context":"board", "type":"solder_mask" }},
 		{"tl_name":"silk_bot" , "new_name":"silk_bot" , "attr":{ "context":"board", "type":"silk_screen" }},
 		{"tl_name":"past_botm" , "new_name":"past_botm" , "attr":{ "context":"board", "type":"solder_paste" }},
-		{"tl_name":"bot_enig" , "new_name":"bot_enig" , "attr":{ "context":"board", "type":"document" }},
-		{"tl_name":"d_(\\d+)-(\\d+)","new_name":"d($1)-($2)" ,"attr":{"context":"board","type":"drill"}},
-		{"tl_name":"drill","new_name":"drill" ,"attr":{"context":"board","type":"drill"}},
+		{"tl_name":"enig_bot" , "new_name":"enig_bot" , "attr":{ "context":"board", "type":"document" }},
+		{"tl_name":"d_(\\d+)-(\\d+)","new_name":"ftdrill($1)-($2)l" ,"attr":{"context":"board","type":"drill"}},
+		{"tl_name":"drill","new_name":"ftdrill" ,"attr":{"context":"board","type":"drill"}},
 		{"tl_name":"rout","new_name":"rout" ,"attr":{"context":"board","type":"rout"}},
 		{"tl_name":"outline","new_name":"outline" ,"attr":{"context":"board","type":"rout"}},
 		{"tl_name":"array","new_name":"array" ,"attr":{"context":"misc"}},

test/mytest.js

@@ -16,7 +16,7 @@ try {
     var layer = "l3"
     
     GEN.copyLayer({source_job:job, source_step:step,source_layer:"gko",dest_layer:"gko_tmp"})
-
+    GEN.selectByFilter({profile:"in"})
     return "Done"
 } catch (e) {
 	IKM.msg(e)