scott

ats/scott_test/analysis_test.js

@@ -671,7 +671,10 @@ try {
         min_line_spacing: ["l2l"],
         min_line2pad: ["p2line","user_bga2nor_line","user_smd2nor_line"],
         min_pad2pad: ["p2p", "smd2smd", "smd2pad","via2via","bga2pad"],
-        min_ar: ["ar","pth_ar"]
+        min_ar_laser:["laser_via_ar"],
+        min_ar_via:["via_ar"],    
+        min_ar_pth:["pth_ar"],
+        min_ar_npth:["npth_ar"]
     }
     save_job_info({
         jobid: JobId,
@@ -784,9 +787,17 @@ try {
         })
         // signal层分析结果
         var res = analysisChkAttr({layers:signalLayers, info:info, step:step, job:job, oChecklistName:oChecklistName})
+        
         //  数据入库
         Object.keys(res).forEach(function(key){
             var val = res[key]
+            for(var key2 in val){
+                if(key2 == "min_ar_npth"){
+                   if(Number(val[key2]) == 0 || Number(val[key2]) == 999){
+                       delete val.min_ar_npth
+                   } 
+                }
+            }
             save_layerinfo({
                 jobid: JobId,
                 layer: key,
@@ -1093,7 +1104,7 @@ function save_layerinfo(props){   //  保存层信息
                     console.log("+==========updateRowlayer:layer:"+layer+";attrname:"+key+";value:"+ val)
                     return q.updateRow({
                         table:'pdm_job_layerattr',
-                        where:{job_id:jobid, attr_name: key},
+                        where:{job_id:jobid, attr_name: key, layer:layer},
                         data:{value:val},
                     })
                 });