s

ats/analysis/ATS_AIM_customer_data_analysis.js

@@ -311,35 +311,20 @@ try {
     var allStep = GEN.getStepList({job:job})
     allStep.forEach(function(step){
         GEN.openStep({job:job,name:step})
-        console.log(3)
         GEN.COM("chklist_single,show=yes,action=valor_cleanup_set_smd")
-        console.log(4)
         GEN.COM("chklist_cupd,chklist=valor_cleanup_set_smd,nact=1,params=((pp_layer=.type=signal|mixed&side=top|bottom)(pp_work_on=SMD\;BGA)(pp_delete=No)(pp_types=Square\;Rect\;Oval)(pp_other_smd=)(pp_sm=No)(pp_drill=)(pp_rotate=No)(pp_ignore_covered=Yes)(pp_bga_types=Round)(pp_other_bga=)(pp_sm_bga=No)(pp_bga_max_pitch=70)(pp_bga_actions=Set attribute)(pp_bga_suffix=_bga)(pp_identify_gf=)),mode=regular")
-        console.log(5)
         GEN.COM("get_user_name")
-        console.log(6)
         GEN.COM("get_job_path,job="+job)
-        console.log(7)
         GEN.COM("disp_on")
-        console.log(8)
         GEN.COM("origin_on")
-        console.log(9)
         GEN.COM("chklist_cnf_act,chklist=valor_cleanup_set_smd,nact=1,cnf=no")
-        console.log(10)
         GEN.COM("chklist_run,chklist=valor_cleanup_set_smd,nact=1,area=profile")
-        console.log(11)
         GEN.COM("skip_next_pre_hook")
-        console.log(12)
         GEN.COM("chklist_run,chklist=valor_cleanup_set_smd,nact=1,area=profile")
-        console.log(13)
         GEN.COM("get_user_name")
-        console.log(14)
         GEN.COM("skip_current_command")
-        console.log(15)
         GEN.COM("disp_on")
-        console.log(16)
         GEN.COM("origin_on")
-        console.log(17)
         GEN.COM("show_tab,tab=Checklists,show=no")
         GEN.closeStep()
     })
@@ -476,7 +461,7 @@ try {
         console.log("==================================> 12 Drill analysis")
         var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果
 
-        console.log("===========  =====drillRes:" + _.toString(drillRes));
+        console.log("===============drillRes:" + _.toString(drillRes));
         drillRes.forEach(function(item){
             save_layerinfo({
                 jobid: JobId,
@@ -487,7 +472,6 @@ try {
                 }
             })
         })
-        throw "tmp"
         //  数据入库 
         Object.keys(res).forEach(function(key){
             var val = res[key]
@@ -785,6 +769,7 @@ function save_layerinfo(props){   //  保存层信息
     var layerinfohash = props.layerinfohash;
     Object.keys(layerinfohash).forEach(function(key){
         var val = layerinfohash[key];
+        if(val && val != ""){
             var value = db.query("",function(q){
                 return q.selectValue({
                     table:'pdm_job_layerattr',  
@@ -812,6 +797,7 @@ function save_layerinfo(props){   //  保存层信息
                     })
                 });
             }
+        }
     })
 }
 function analysis(props){

test/scott_test.js

@@ -64,29 +64,15 @@ try {
     
 
 	var matrix = GEN.getMatrix({job:job})
-	var drillLayers = Object.keys(matrix).filter(function(v){return matrix[v].layer_type == "drill"})
+	var signalLayers = Object.keys(matrix).filter(function(v){return matrix[v].layer_type == "signal"})
 	var step = "cad"
 	GEN.openStep({job:job, name:step})
-    console.log("==================================>drillLayers:"+_.toString(drillLayers))
-	// 钻孔
-	var drillToSignals = drillLayers.map(function(v){  // 获取到钻孔层对应的顶层和底层
-        var simbols = GEN.getLayerSymsHist({job:job,step:step,layer:v})
-        var symbol = _.values(simbols).sort(function(a,b){return Number(a.size)-Number(b.size)})
-        .reduce(function(a,b){
-            if(b.pad!="0"){
-                a.push(b.symbol)
-            }
-            return a 
-        },[])[0]
-        return {layer:v,symbol:symbol,start:matrix[v]["drl_start"],end:matrix[v]["drl_end"]}
+    var copper_percent_pcs = signalLayers.map(function(v){
+		var tmp = {layer:v}
+		tmp.copper_percent = GEN.copperArea({layer1:v}).percent + "%"
+		return tmp
 	})
-    console.log("===============================>drillToSignals:"+_.toString(drillToSignals))
-
-	// var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果
-
-    // console.log("==================================>drillRes:"+_.toString(drillRes))
-
-
+    console.log("==================================>copper_percent_pcs:"+_.toString(copper_percent_pcs))
 
     QDfm.updateRow({
 		table: "pdm_aimdfm_task",
@@ -115,49 +101,3 @@ catch (e) {
     resultData.push({type: "error", title: "脚本执行出错!", detail: [{desc: _.toString(e)}]});
     return {status: Status, result_data: resultData};
 }
-
-function analysisDrill(par, step){
-    // {"layer":"d1-2","symbol":"r3.937","start":"top","end":"isl2"}
-    // {"layer":"d1-2","symbol":"r35.0394","start":"top","end":"bottom"}
-    var job = Job.toLowerCase()
-    var res = par.map(function(drill){
-		GEN.affectedLayer({affected:'no',mode:'all'})
-		GEN.affectedLayer({affected:'yes',layer:drill.layer})
-        GEN.selClearFeature()
-		GEN.selectByFilter({feat_types:"pad",include_syms:drill.symbol})
-		if(GEN.getSelectCount()>0){
-			// 拷贝到_tmp
-			var tmplayer = drill.layer + "_tmp"
-			if(GEN.isLayerExists({job:job,layer:tmplayer})){GEN.deleteLayer({job:job,step:step,layer:tmplayer})}
-			GEN.selCopyOther({dest:"layer_name",target_layer:tmplayer})
-			GEN.affectedLayer({affected:"no",mode:"all"})
-			GEN.selClearFeature();
-			[drill.start,drill.end].forEach(function(item, i){
-				GEN.workLayer({name:item,display_number:1,clear_before:"yes"})
-				GEN.COM("sel_ref_feat",
-				{layers:tmplayer,use:"filter",mode:"touch",pads_as:"shape",f_types:"pad",polarity:"positive\;negative",include_syms:drill.symbol})
-				if(GEN.getSelectCount()>0){
-					var res = ""
-					var pads = GEN.getFeatures({job:job,step:step,layer:item,options:"select"})
-					if(pads && pads.length) {
-						pads = pads.filter(function(item){
-							return /^r\d+/.test(item.symbol)
-						})
-						pads = pads.sort(function(a,b){
-							return parseInt(a.symbol) - parseInt(b.symbol) 
-						})
-						res = pads[0].symbol.slice(1)
-					}
-					if ( i == 0) {
-						drill.drl_pad_top = res
-					} else if (i==1){
-						drill.drl_pad_bot = res
-					}
-				}
-			})
-			GEN.deleteLayer({job:job,step:step,layer:tmplayer})
-		}
-        return drill
-    })
-    return res
-}
\ No newline at end of file