scott

ats/topcam/ATS_AIM_customer_data_analysis.js

@@ -137,7 +137,6 @@ var resultData = [];
 var ALL = {}
 var Omatrix = {};
 try {
-  
     console.log("=============================================>anaysis_start");
     var par = PAR;
     var vc_src_01005_pad_result = par.vc_src_01005_pad_result
@@ -152,7 +151,7 @@ try {
     // 检查料号是否能够check out
 	if(GEN.checkInout({job:job,mode:"test"}) != 0 && mode == "aimdfm"){ throw "the job check" }
     GEN.checkInout({job:job,mode:"out"});
-    script_info({ result_severity: "analysis start" })
+    script_info({ msg: "analysis start" })
 	script_info({ progress: 65 })
     var pcs_step = par.pcs_step == "" ? "cad" : par.pcs_step;
     var array_step = par.array_step == "" ? "stp" : par.array_step;
@@ -163,7 +162,9 @@ try {
     if(step_list.indexOf(pcs_step)<0){
         pcs_step = step_list[0]
     }
-    script_info({ result_severity: "analysis update_matrix_info" })
+
+
+    script_info({ msg: "analysis update_matrix_info" })
 	script_info({ progress: 65 })
     var matrix = UPLOAD_LAYER_MATRIX({job:job})  // 分析matrix 获得分析后的matrix信息
     GEN.openStep({job:job, name:pcs_step})
@@ -219,7 +220,7 @@ try {
     })
     GEN.clearLayers()
 
-    script_info({ result_severity: "analysis drill_stack" })
+    script_info({ msg: "analysis drill_stack" })
 	script_info({ progress: 70 })
     // * new 钻孔叠构
     var cam_drill_structure = []
@@ -361,7 +362,7 @@ try {
         rmOutProfile({job:job, step:pcs_step})
     }
     GEN.closeStep()
-    script_info({ result_severity: "analysis panel_info" })
+    script_info({ msg: "analysis panel_info" })
 	script_info({ progress: 70 })
     // * profile 和 拼版
     var pandle_step = step_list.map(function(v){
@@ -435,7 +436,7 @@ try {
     }
     ALL.gold_fingers = gold_fingers
     GEN.closeStep()
-    script_info({ result_severity: "analysis some_job_info" })
+    script_info({ msg: "analysis some_job_info" })
     var config = {
         jobInfo: {
             layer_count: ["signal","power_ground"],  // Board属性的signal或者power_ground层
@@ -515,7 +516,7 @@ try {
     console.log("===================================> 5 save drill info")
 
     
-    script_info({ result_severity: "analysis drill_info" })
+    script_info({ msg: "analysis drill_info" })
 	script_info({ progress: 75 })
     // * 获取pcs_step 和 array_step的钻孔信息
     var drill_tool_info = {}; 
@@ -530,6 +531,7 @@ try {
             name:par.array_step
         }
     ]
+
     steps_drillinfo.forEach(function(item){
         var type = item.type;
         var step = item.name;
@@ -537,7 +539,7 @@ try {
             drillLayers.forEach(function(layer){
                 var layer = layer.name;
                 if(!GEN.isLayerEmpty({job:job,step:step,layer:layer})){
-                    GEN.COM("tools_set,layer="+layer+",slots=by_length")
+                    // GEN.COM("tools_set,layer="+layer+",slots=by_length")
                     var tool = GEN.getTool({job:job,step:step,layer:layer,units:"mm"}); // {"1":{"count":"01156","num":"1","type":"plated","min_tol":"0","max_tol":"0","finish_size":"100.31","drill_size":"100.31","slot_len":"0","type2":"standard","shape":"hole","bit":0}}
                     if(!drill_tool_info[layer]){
                         drill_tool_info[layer] = tool;
@@ -639,7 +641,7 @@ try {
 	})
 
     console.log("=============================> 6 set smd bga")
-    script_info({ result_severity: "analysis smd&bga" })
+    script_info({ msg: "analysis smd&bga" })
 	script_info({ progress: 80 })
     var allStep = GEN.getStepList({job:job})
     allStep.forEach(function(step){
@@ -783,6 +785,7 @@ try {
         jobid: JobId,
         jobinfohash: {ATS_surface_area_base_on:"Card"}
     })
+
     var jobpath = GEN.getJobPath({job:job})
     // if(GEN.GEN_TYPE == "genesis"){
     //     jobpath = GEN.getJobPath({job:job})
@@ -790,7 +793,7 @@ try {
     //     jobpath = "/home/local_db/server_db/jobs/"+job
     // }
     mkPath(jobpath,["user","opcam","steps"])
-    script_info({ result_severity: "analysis signal" })
+    script_info({ msg: "analysis signal" })
 	script_info({ progress: 85 })
     stepList.forEach(function(step){
         GEN.openStep({ job: job, name: step })
@@ -943,7 +946,7 @@ try {
         if(par.erf){
             tmpitem.erf = par.erf
         }
-        script_info({ result_severity: "analysis run_signal_chk" })
+        script_info({ msg: "analysis run_signal_chk" })
         createChklistAndRun({   // 创建checklist并运行
             layers: signalLayers,
             items: [tmpitem]
@@ -1005,7 +1008,7 @@ try {
     IKM.msg("export")
     
 
-    script_info({ result_severity: "analysis export" })
+    script_info({ msg: "analysis export" })
 	script_info({ progress: 95 })
     // 导出
     if(par.export_path != "" && par.export_mode != "" && par.export_submode != "" ){
@@ -1132,6 +1135,26 @@ function ANALYSIS_STACKUP(props){
     var matrix = GEN.getMatrix({job:job})
     var layer_count = GEN.getLayerCount({job:job}) // !
     save_job_info({jobid:JobId,jobcategory:props.jobcategory,jobinfohash:{TL_layer_count:layer_count}});
+    
+    var job_attrs = db.query("",function(q){
+		return q.selectValue({
+			table:'pdm_job',
+			field_format:{job_attrs:'json'},
+			field:'job_attrs',
+			where:{id : JobId}
+		})
+	});
+	if (!job_attrs ) { job_attrs = {}} 
+	job_attrs.layer_count = layer_count
+	db.query("",function(q){
+		return q.updateRow({
+			table:'pdm_job',
+			data:{job_attrs:job_attrs},
+			update_policy:{attr_data:'json_merge'},
+			where:{id : JobId}
+		})
+	});
+
 	_.values(matrix).sort(function(a,b){return a.row-b.row}).forEach(function(layer){
         layer.odb_name = layer.name;
 		layer.name = layer.tl_name;
@@ -1265,6 +1288,7 @@ function selCopyLayer(props){  // 拷贝选择的到辅助层
 function save_job_info(props){  //  保存料号信息
     var jobid = props.jobid;
     var jobinfohash = props.jobinfohash;
+
     Object.keys(jobinfohash).forEach(function(key){
         var val = jobinfohash[key];
         var value = db.query("",function(q){
@@ -1274,7 +1298,6 @@ function save_job_info(props){  //  保存料号信息
                 where:{job_id:jobid, attr_name: key}
             })
         });
-        console.log("jobid:"+jobid+"==========dbjobvalue:" + val)
         if(/done/ig.test(value) || !value){
             db.query("",function(q){
                 return q.insertRow({
@@ -2034,6 +2057,7 @@ function analysisDrill(par, step){
                 GEN.workLayer({name:item,display_number:1,clear_before:"yes"})
                 GEN.COM("filter_set,filter_name=popup,update_popup=no,feat_types=pad");
 				GEN.COM("sel_ref_feat",{layers:tmplayer,use:"filter",mode:"touch",pads_as:"shape",f_types:"pad",polarity:"positive\;negative",include_syms:drill.symbol})
+                // GEN.selRefFeat({layers:tmplayer, use:"filter",mode:"touch"})
                 GEN.COM("filter_reset,filter_name=popup")
                 if(GEN.getSelectCount()>0){
 					var res = ""
@@ -2043,7 +2067,7 @@ function analysisDrill(par, step){
 							return /^r\d+/.test(item.symbol)
 						})
 						pads = pads.sort(function(a,b){
-							return parseInt(a.symbol) - parseInt(b.symbol) 
+							return parseInt(a.symbol.slice(1)) - parseInt(b.symbol.slice(1)) 
 						})
 						res = pads[0].symbol.slice(1)
 					}

ats/topcam/ATS_AIM_data_format.js

@@ -68,7 +68,7 @@ if (mode === "aimdfm") {
 var Status = 'ok';
 var resultData = [];
 try {
-	script_info({ result_severity: "format start" })
+	script_info({ msg: "format start" })
 	script_info({ progress: 35 })
     var par = PAR;
 	if(!par.hasOwnProperty("config_path") || par.config_path==""){
@@ -229,7 +229,7 @@ try {
 	
 	
 	// 改名
-	script_info({ result_severity: "format rename" })
+	script_info({ msg: "format rename" })
 	script_info({ progress: 50 })
 	err = reName({job:job, matrix:after_sort_matrix, cfg:format_cfg})
 	if(err){throw err}
@@ -290,7 +290,7 @@ try {
 	err = setDrill({job:job})
 	if(err){throw err}
 
-	script_info({ result_severity: "format create profile" })
+	script_info({ msg: "format create profile" })
 	script_info({ progress: 55 })
 	var all_layer = Object.keys(tmp_matrix)
 	// 没有outline层
@@ -301,7 +301,7 @@ try {
 		GEN.openStep({job:job, name:tmp_step})
 		var now_profile = GEN.getProfile({job:job, step:tmp_step})
 		if(now_profile.match(/\n/ig).length == 1){  // 如果没有profile
-			if(profileRule[0] == "outline") {
+			if(profileRule[0] == "outline" && /1352/ig.test(PAR.customer)) {
 				GEN.workLayer({name:'outline',display_number:2,clear_before:'yes'})
 				GEN.selAllFeat()
 				if(GEN.getSelectCount() > 0) {
@@ -317,7 +317,7 @@ try {
 			}
 			var hasProfile = GEN.getProfile({job:job, step:tmp_step})
 			if(hasProfile.match(/\n/ig).length == 1){
-				script_info({ result_severity: "创建profile失败" })
+				script_info({ msg: "创建profile失败" })
 				throw "创建profile失败"
 			}
 		} 
@@ -336,7 +336,6 @@ try {
 		$.QDfm.updateRow({
 			table: "pdm_aimdfm_task",
 			data: {
-				result_severity: "format ok",
 				progress: 60
 			},
 			where: { id: $.task_id }
@@ -669,7 +668,6 @@ function mergeLaser(props){ // 合并钻孔
 function createOutline(props){
 	var profileRule = props.profileRule
 	console.log("----profileRule------->:" + _.toString(profileRule));
-	
     var job = props.job
     var step = props.step
     var matrix = GEN.getMatrix({job:job})
@@ -683,16 +681,25 @@ function createOutline(props){
 		})
 		return flag
 	})
-	console.log("----   outlines------->:" + _.toString(outlines));
 	var drill_layer = Object.keys(matrix).filter(function(v){return matrix[v].layer_type=="drill" && matrix[v].context == "board"})
 	var tmp = "drill_all";
-	if(GEN.isLayerExists({job:job, layer:tmp})) { GEN.deleteLayer({job:job, layer:tmp})}
-	GEN.openStep({job:job, name:step})
-		GEN.affectedLayer({affected:'yes',layer:drill_layer})
+	if(GEN.isLayerExists({job:job, layer:tmp})) { GEN.deleteLayer({job:job, layer:[tmp]})}
+	drill_layer.forEach(function(d_layer) {
+		GEN.workLayer({name:d_layer,display_number:2,clear_before:'yes'})
 		GEN.selCopyOther({dest:'layer_name',target_layer:tmp,invert:'no',dx:0,dy:0,size:0})
-		GEN.affectedLayer({affected:'no',mode:'all'})
+	})
+	
 	GEN.closeStep()
 
+	if (outlines.indexOf("outline") >= 0) {
+		outlines = outlines.reduce(function(a,b){
+			if(b != "outline") {
+				a.push(b)
+			}
+			return a
+		}, ["outline"])
+	}
+	
     var tmp_outline
     if(outlines.length){
         if( outlines.length){

ats/topcam/ATS_AIM_data_input.js → ats/topcam/ATS_AIM_input_data.js

@@ -89,7 +89,7 @@ var resultData = [];
 var import_info = [];
 var inputState = [];
 try {
-	script_info({ result_severity: "import start" })
+	script_info({ msg: "import start" })
 	var par = PAR;
 	// var db_path = db.query("",function(q){
 	// 	return q.selectValue({
@@ -164,8 +164,8 @@ try {
 	} else {
 		jobFiles = fs.listDir(jobFile[0].path)
 	}
-	GEN.COM("config_edit,name=iol_gbr_polygon_break,value=1,mode=user")
-	GEN.COM("config_edit,name=iol_fix_ill_polygon,value=yes,mode=user")
+	// GEN.COM("config_edit,name=iol_gbr_polygon_break,value=1,mode=user")
+	// GEN.COM("config_edit,name=iol_fix_ill_polygon,value=yes,mode=user")
 	
 	// 将jobFile下的zip解压
 	decompression(jobFile[0].path, [])
@@ -198,7 +198,7 @@ try {
 	// 分析料号文件 得到料号导入信息 导入类型
 	var jobInfo = analyJobFiles({jobFiles:jobFiles.filter(function(v){return v.isFile}),custCfg:custCfg,config:config,job:job })
 	if(jobInfo.data.length == 0){
-		script_info({ result_severity: "file error" })
+		script_info({ msg: "file error" })
 		throw "file error"}
 	var importOk = false;  // 是否成功导入
 
@@ -301,7 +301,7 @@ try {
 		GEN.COM("input_manual")
 		importOk = true
 	}
-	if(!importOk){ script_info({ result_severity: "import error" }); throw "import error"}
+	if(!importOk){ script_info({ msg: "import error" }); throw "import error"}
 	script_info({ progress: 20 })
 	reNameStep(job)
 	if(/2171/.test(par.customer)){
@@ -338,7 +338,7 @@ try {
 			}
 		})
 	}
-	
+	GEN.closeStep()
 	GEN.checkInout({job:job,mode:"out"})  // 结束保存料号 关闭料号
 	GEN.saveJob({ job: job });
 	GEN.checkInout({job:job,mode:"in"})
@@ -356,7 +356,7 @@ try {
 	import_html += "</table>"
     // name type date user
     resultData.push({type: "info",title:"导入资料列表",detail: [{ desc: import_html }] })
-	script_info({ result_severity: "import ok" })
+	script_info({ msg: "import ok" })
 	if (mode === "aimdfm") {
 		$.QDfm.updateRow({
 			table: "pdm_aimdfm_task",
@@ -395,7 +395,6 @@ function delSameJob(props){
     var job = props.job
 	var delSame = props.delSame
 	console.log("======================>delsame:"+ delSame);
-	
     if(GEN.isJobExists({job:job})){   
         if(/^yes$/ig.test(delSame)){
             if(GEN.isJobOpen({job:job})){ GEN.closeJob({job:job}) }
@@ -535,6 +534,7 @@ function script_info(props){  // result_severity  progress
 	}
 }
 
+
 function decompression(path, zips) {
 	var files = fs.listDir(path)
 	var count = 0;

ats/topcam/config_ats.js

@@ -679,6 +679,7 @@
 								GEN.COM("tools_set,layer="+layer+",thickness=0,user_params=,slots=by_length")
 							}
 						})
+						GEN.saveJob({ job: job });
 					}
 				}
 			]
@@ -964,7 +965,6 @@
 			],
 			"mergerule" : {
 				profile:["silk_top"],
-				drill:["(\\d+)-(\\d+)\\.drl$","\\.d(\\d+)$"],
 				laser : {
 					tl_name: "drill($1)-($2)",
 					regs: ["(\\d+)-(\\d+)\\.drl$"]