scott

ats/analysis/ATS_AIM_customer_data_analysis.js

@@ -100,7 +100,6 @@ try {
     }
     var matrix = UPLOAD_LAYER_MATRIX({job:job})  // 分析matrix 获得分析后的matrix信息
     GEN.openStep({job:job, name:pcs_step})
-    GEN.units({type:"mm"})
     _.values(matrix).forEach(function(v){
         if(v.context == "board" && v.layer_type == "drill"){
             if(v.type == "laser_drill"){
@@ -306,6 +305,8 @@ try {
         })
     })
 
+    
+
     console.log("=============================> 6 set smd bga")
     var allStep = GEN.getStepList({job:job})
     allStep.forEach(function(step){
@@ -459,6 +460,7 @@ try {
         // signal层分析结果
         var res = analysisChkAttr({layers:signalLayers, info:info, step:step, job:job, oChecklistName:oChecklistName})
         
+        console.log("==================================> Drill analysis")
         // 钻孔
         var drillToSignals = drillLayers.map(function(v){  // 获取到钻孔层对应的顶层和底层
             var simbols = GEN.getLayerSymsHist({job:job,step:step,layer:v})
@@ -469,24 +471,12 @@ try {
                 }
                 return a 
             },[])[0]
-            return {layer:v,symbol:symbol,start:matrix[v]["drl_start"],end:matrix[v]["drl_end"]}
+            return {layer:v,symbol:symbol,start:tmp_matrix[v]["drl_start"],end:tmp_matrix[v]["drl_end"]}
         })
         console.log("==================================> 12 Drill analysis")
         var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果
 
-        console.log("================drillRes:" + _.toString(drillRes));
-        
-        throw "tmp"
-
-        //  数据入库 
-        Object.keys(res).forEach(function(key){
-            var val = res[key]
-            save_layerinfo({
-                jobid: JobId,
-                layer: key,
-                layerinfohash: val
-            })
-        })
+        console.log("===========  =====drillRes:" + _.toString(drillRes));
         drillRes.forEach(function(item){
             save_layerinfo({
                 jobid: JobId,
@@ -497,6 +487,17 @@ try {
                 }
             })
         })
+        throw "tmp"
+        //  数据入库 
+        Object.keys(res).forEach(function(key){
+            var val = res[key]
+            save_layerinfo({
+                jobid: JobId,
+                layer: key,
+                layerinfohash: val
+            })
+        })
+        
         // 铜面积
         console.log("=============================> 13 save copper_percent")
         var copper_percent_pcs = signalLayers.map(function(v){
@@ -1054,7 +1055,7 @@ function smdAnalysis(props){
     var layers = props.layers
     var res = {}
     steplist.forEach(function(step){
-        GEN.openStep({job:job,step:step})
+        GEN.openStep({job:job,name:step})
         layers.forEach(function(layer){
             // 计算开窗 数量 
             if(layer.solderL){
@@ -1257,7 +1258,6 @@ function analysisChkAttr(par) {
                     job: job,
                     step: par.step,
                     checklist: oChecklistName,
-                    units:"mm",
                     nact: 1,
                     attr: v + "_min_" + type
                 })
@@ -1279,12 +1279,13 @@ 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()
+    GEN.affectedLayer({affected:'no',mode:'all'})
     var res = par.map(function(drill){
-		GEN.affectedLayer({affected:'no',mode:'all'})
-		GEN.affectedLayer({affected:'yes',layer:drill.layer})
+        GEN.workLayer({name:drill.layer,display_number:2,clear_before:'yes'})
         GEN.selClearFeature()
-		GEN.selectByFilter({feat_types:"pad",include_syms:drill.symbol})
+        GEN.selectByFilter({feat_types:'pad', include_syms:drill.symbol})
 		if(GEN.getSelectCount()>0){
+            console.log("==========================>jinru 111111111")
 			// 拷贝到_tmp
 			var tmplayer = drill.layer + "_tmp"
 			if(GEN.isLayerExists({job:job,layer:tmplayer})){GEN.deleteLayer({job:job,step:step,layer:tmplayer})}
@@ -1336,7 +1337,7 @@ function bgaAnalysis(props){
     }
     var res = {}
     steplist.forEach(function(step){
-        GEN.openStep({job:job,step:step})
+        GEN.openStep({job:job,name:step})
         layers.forEach(function(layer){
             // 找出bga 拷贝到辅助层
             GEN.workLayer({name:layer.signalL,display_number:2,clear_before:'yes'})

test/scott_test.js

@@ -80,11 +80,11 @@ try {
         },[])[0]
         return {layer:v,symbol:symbol,start:matrix[v]["drl_start"],end:matrix[v]["drl_end"]}
     })
-    console.log("==================================>drillToSignals:"+_.toString(drillToSignals))
+    console.log("===============================>drillToSignals:"+_.toString(drillToSignals))
 
-	var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果
+	// var drillRes = analysisDrill(drillToSignals,step) // 钻孔分析结果
 
-    console.log("==================================>drillRes:"+_.toString(drillRes))
+    // console.log("==================================>drillRes:"+_.toString(drillRes))