s

ats/input/ATS_AIM_data_input.js

@@ -127,7 +127,7 @@ try {
 	var step = custCfg.step.toLowerCase()
 	// 获取路径下文件信息
 	var path = par.path
-	console.log("=============>path:"+ path)
+	console.log("=========  ====>path:"+ path)
 	if(!fs.exists(path)){throw "path error"}
 	var pathInfo = fs.listDir(path, 1)
 	// 判断存不存在料号文件
@@ -148,27 +148,42 @@ try {
 			var err = importJob({name:job,db:custCfg.db,path:jobInfo.data[0].file.path},config.delSameJob)
 			if(err){throw err}
 		} else {  // 多个tgz文件 说明需要合并
-			var mergeFiles = jobInfo.data.filter(function(item){
-				var err = importJob({name:item.file.baseName,db:custCfg.db,path:item.file.path},config.delSameJob)
+			var jobs = jobInfo.data.map(function(item, i){
+				var err = importJob({name:job + "_tmp_" + i,db:custCfg.db,path:item.file.path},config.delSameJob)
 				if(err){throw err}
-				return /yes/ig.test(item.format.isMerge)
+				return job + "_tmp_" + i
 			})
-			var arr_job = mergeFiles[0]
-			var arr_step;
-			var steplist = GEN.getStepList({job:arr_job.file.baseName})
-			if(steplist.indexOf(arr_job.format.arrStep) < 0){
-				arr_step = steplist[0]
-			}else{arr_step = arr_job.format.arrStep}
-			GEN.openJob({job:job});
-			GEN.openJob({job:arr_job.file.baseName});
+			var job_type = {
+				pcs: "pcs",
+				cad: "pcs",
+				stp: "arr",
+				arr: "arr",
+				array: "arr"
+			}
+			// 分析arr_job 和 pcs_job
+			jobs = jobs.map(function(jobname){
+				GEN.openJob({job:jobname});
+				var step_tmp = GEN.getStepList({job:jobname})[0]
+				var type = job_type[step_tmp]
+				return {
+					jobname: jobname,
+					stepname:  step_tmp,
+					type: type
+				}
+			})
+			var pcs_job = jobs.filter(function(v){return v.type == "pcs"})
+			var arr_job = jobs.filter(function(v){return v.type == "arr"})
 			GEN.copyStep({  // 合并
-				source_job:arr_job.file.baseName,
-				source_name:arr_step,
-				dest_job:job,
-				dest_name:arr_step,
+				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.file.baseName });
-			GEN.deleteJob({ job: arr_job.file.baseName });  // 合并后 删除array的料号
+
+			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
 	}

config_ats.js

@@ -154,18 +154,7 @@
 				{ 
 					"valid": function(props){
 						var file = props.file;
-						var job = props.job;
-						var reg = new RegExp("^"+job+"-a","ig")
-						return /.+\.tgz$/ig.test(file.name) && reg.test(file.baseName)
-					}, 
-					"type": "ODB",		
-					"format": "ODB_1"
-				},
-				{ 
-					"valid": function(props){
-						var file = props.file;
-						var job = props.job;
-						return /.+\.tgz$/ig.test(file.name) && job == file.baseName
+						return /.+\.tgz$/ig.test(file.name) && !(/-a/ig.test(file.baseName))
 					}, 
 					"type": "ODB",		
 					"format": "ODB"
@@ -559,13 +548,13 @@
 	},
 	"data_format": [
 		{"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":"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":"^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":"solder_paste" }},
+		{"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":"d_(\\d+)-(\\d+)","new_name":"d($1)-($2)" ,"attr":{"context":"board","type":"drill"}},
 		{"tl_name":"drill","new_name":"drill" ,"attr":{"context":"board","type":"drill"}},

jtg/input原稿/JTG_ORG_set_origin_aim.js

@@ -42,7 +42,7 @@ PARAMETER:
 */
 //////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////
-console.log("==============================>set origin");
+console.log("===================   =======>set origin");
 // 引入模块 包
 var $ = require('topcam.scriptfunc').argv();
 var fs = require('fs');

test/mytest.js

@@ -10,10 +10,13 @@ var Job = $.job;
 var JobId = $.job_id;
 
 try {
-    var job = "1"
-    var step = "cad"
-    var matrix = GEN.getMatrix({job:job})
-    IKM.msg(matrix)
+    var job = "sj"
+    var step = "orig"
+    var tmp2 = "tmp2" 
+    var layer = "l3"
+    
+    GEN.copyLayer({source_job:job, source_step:step,source_layer:"gko",dest_layer:"gko_tmp"})
+
     return "Done"
 } catch (e) {
 	IKM.msg(e)

test/test.js

 
-var tmp = "12.5466"
 
-console.log(tmp.toFixed(2));
+
+var t = "orig"
+var step_reg = new RegExp(t) 
+var list = ["orig", "net"]
+
+list = list.filter(function(v){return step_reg.test(v)})
+
+console.log(list);
+