Skip to content

S
Scott
Commit ba8d156b authored by Scott Sun's avatar Scott Sun
Browse files
Options

s

parent 1dbd449a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3124 additions and 382 deletions
ats/input/ATS_AIM_data_input.js
View file @ ba8d156b
...@@ -75,6 +75,7 @@ if ($.conf.product_type == "aimdfm") { ...@@ -75,6 +75,7 @@ if ($.conf.product_type == "aimdfm") {
} }
var GEN = $.gen; var GEN = $.gen;
var Job = $.job_name; var Job = $.job_name;
var JobId = $.job_id;
var db = $.db; var db = $.db;
var Status = 'ok'; var Status = 'ok';
var resultData = []; var resultData = [];
...@@ -95,6 +96,16 @@ try { ...@@ -95,6 +96,16 @@ try {
console.log("========================db"); console.log("========================db");
par.db = "genesis" par.db = "genesis"
}; };
var db_customer = db.query("",function(q){
return q.selectValue({
table:'pdm_job',
field:'customer_code',
where:{id : JobId}
})
});
if(db_customer && !(/^done$/ig.test(db_customer)) && db_customer != "" ){
par.customer = db_customer
}
par.customer = par.customer[0].toUpperCase()+par.customer.slice(1).toLowerCase() par.customer = par.customer[0].toUpperCase()+par.customer.slice(1).toLowerCase()
var cfg = db.query("",function(q){ var cfg = db.query("",function(q){
return q.selectValue({ return q.selectValue({
......
ats/rename/ATS_AIM_data_format.js
View file @ ba8d156b
...@@ -58,7 +58,8 @@ if ($.conf.product_type == "aimdfm") { ...@@ -58,7 +58,8 @@ if ($.conf.product_type == "aimdfm") {
} }
var GEN = $.gen; var GEN = $.gen;
var Job = $.job_name; var Job = $.job_name;
var db = $.db var db = $.db;
var JobId = $.job_id;
var Status = 'ok'; var Status = 'ok';
var resultData = []; var resultData = [];
var PAR = {}; var PAR = {};
...@@ -74,6 +75,16 @@ try { ...@@ -74,6 +75,16 @@ try {
console.log("========================cfg"); console.log("========================cfg");
par.config_path = "cam/input_data" par.config_path = "cam/input_data"
}; };
var db_customer = db.query("",function(q){
return q.selectValue({
table:'pdm_job',
field:'customer_code',
where:{id : JobId}
})
});
if(db_customer && !(/^done$/ig.test(db_customer)) && db_customer != "" ){
par.customer = db_customer
}
par.customer = par.customer[0].toUpperCase()+par.customer.slice(1).toLowerCase() par.customer = par.customer[0].toUpperCase()+par.customer.slice(1).toLowerCase()
var cfg = db.query("",function(q){ var cfg = db.query("",function(q){
return q.selectValue({ return q.selectValue({
...@@ -117,6 +128,23 @@ try { ...@@ -117,6 +128,23 @@ try {
// 改名 // 改名
err = reName({job:job, matrix:after_sort_matrix, cfg:format_cfg}) err = reName({job:job, matrix:after_sort_matrix, cfg:format_cfg})
if(err){throw err} if(err){throw err}
// 创建profile
var new_martix = GEN.getMatrix({job:job})
var profileLayer = Object.keys(new_martix).filter(function(v){
return new_martix[v].layer_type=="rout"
})
if(profileLayer.length){
var tmp = profileLayer[0]
if(profileLayer.indexOf("outline")>=0){tmp = "outline"}
var step = GEN.getStepList({job:job})[0];
GEN.openStep({job:job,name:step})
GEN.workLayer({name:tmp,display_number:2,clear_before:'yes'})
GEN.selCreateProfile()
GEN.closeStep()
}
// end // end
GEN.checkInout({job:job,mode:"out"}) // 结束保存料号 关闭料号 GEN.checkInout({job:job,mode:"out"}) // 结束保存料号 关闭料号
GEN.saveJob({ job: job }); GEN.saveJob({ job: job });
......
config_ats.js
View file @ ba8d156b
...@@ -150,7 +150,6 @@ ...@@ -150,7 +150,6 @@
"customer": { "customer": {
"Customer_1": { "Customer_1": {
"path": "/opt/resource/customer_1", "path": "/opt/resource/customer_1",
"db": "genesis",
"step": "cad", "step": "cad",
"rules": [ "rules": [
{ {
...@@ -190,15 +189,16 @@ ...@@ -190,15 +189,16 @@
} }
], ],
"tl_name": [ "tl_name": [
{"orig_name" : "^spt$", "tl_name" : "spt" }, {"orig_name" : ["^sst$","^past_top$"], "tl_name" : "past_top" },
{"orig_name" : "^smt$", "tl_name" : "smt" }, {"orig_name" : ["^ssb$","^past_botm$"], "tl_name" : "past_botm" },
{"orig_name" : "^smb$", "tl_name" : "smb" }, {"orig_name" : ["^spt$","^silk_top$"], "tl_name" : "silk_top" },
{"orig_name" : "^spb$", "tl_name" : "spb" }, {"orig_name" : ["^spb$","^silk_bot$"], "tl_name" : "silk_bot" },
{"orig_name" : "^ssb$", "tl_name" : "ssb" }, {"orig_name" : ["^smt$","^sm_top$"], "tl_name" : "sm_top" },
{"orig_name" : "^sst$", "tl_name" : "sst" }, {"orig_name" : ["^smb$","^sm_botm$"], "tl_name" : "sm_botm" },
{"orig_name" : "^top$", "tl_name" : "top" }, {"orig_name" : "^top$", "tl_name" : "top" },
{"orig_name" : "^drill$", "tl_name" : "drill" }, {"orig_name" : "^drill$", "tl_name" : "drill" },
{"orig_name" : "^rout$", "tl_name" : "rout" }, {"orig_name" : ["outline.art","^outline$"], "tl_name" : "outline" },
{"orig_name" : ["^rout$","\\.rou$"], "tl_name" : "rout" },
{"orig_name" : "^bottom$", "tl_name" : "bottom" }, {"orig_name" : "^bottom$", "tl_name" : "bottom" },
{"orig_name" : ["^isl(\\d+)$","^layer_(\\d+)$"], "tl_name" : "l_($1)"}, {"orig_name" : ["^isl(\\d+)$","^layer_(\\d+)$"], "tl_name" : "l_($1)"},
{"orig_name" : ["_isl(\\d+)_isl(\\d+)","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"}, {"orig_name" : ["_isl(\\d+)_isl(\\d+)","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
...@@ -208,7 +208,6 @@ ...@@ -208,7 +208,6 @@
}, },
"Customer_2": { "Customer_2": {
"path": "/opt/resource/customer_2", "path": "/opt/resource/customer_2",
"db": "genesis",
"step": "cad", "step": "cad",
"rules": [ "rules": [
{ {
...@@ -337,7 +336,7 @@ ...@@ -337,7 +336,7 @@
{"orig_name" : ["^0(\\d+).*ccp_ms","^s(\\d+)\.art","lay(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"}, {"orig_name" : ["^0(\\d+).*ccp_ms","^s(\\d+)\.art","lay(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"},
{"orig_name" : ["^bottom$","^bottom.art$"], "tl_name" : "bottom" }, {"orig_name" : ["^bottom$","^bottom.art$"], "tl_name" : "bottom" },
{"orig_name" : ["-(\\d+)-(\\d+)\.drl$","(\\d+)-(\\d+)-laser\.drl$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"}, {"orig_name" : ["-(\\d+)-(\\d+)\.drl$","(\\d+)-(\\d+)-laser\.drl$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
{"orig_name" : ["\\.rou$","rout"], "tl_name" : "rout" }, {"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
{"orig_name" : "fab.art", "tl_name" : "fab.art" }, {"orig_name" : "fab.art", "tl_name" : "fab.art" },
{"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" }, {"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" },
{"orig_name" : ["outline.art","^outline$"], "tl_name" : "outline" }, {"orig_name" : ["outline.art","^outline$"], "tl_name" : "outline" },
...@@ -348,7 +347,6 @@ ...@@ -348,7 +347,6 @@
}, },
"New_data": { "New_data": {
"path": "/opt/resource/new_data", "path": "/opt/resource/new_data",
"db": "genesis",
"step": "cad", "step": "cad",
"rules": [ "rules": [
{ {
...@@ -451,17 +449,18 @@ ...@@ -451,17 +449,18 @@
} }
], ],
"tl_name": [ "tl_name": [
{"orig_name" : "pasttop.art", "tl_name" : "past_top" }, {"orig_name" : ["pasttop.art","^past_top$","top_solderpaste"], "tl_name" : "past_top" },
{"orig_name" : "pleg.art", "tl_name" : "silk_top" }, {"orig_name" : ["pleg.art","^silk_top$","top_silkscreen"], "tl_name" : "silk_top" },
{"orig_name" : "soldtop.art", "tl_name" : "sm_top" }, {"orig_name" : ["soldtop.art","^sm_top$","top_soldermask"], "tl_name" : "sm_top" },
{"orig_name" : ["top.art","^top$"], "tl_name" : "top" }, {"orig_name" : ["top.art","^top$"], "tl_name" : "top" },
{"orig_name" : ["inner_(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"}, {"orig_name" : ["inner_(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"},
{"orig_name" : ["bottom.art","^bottom$"], "tl_name" : "bottom" }, {"orig_name" : ["bottom.art","^bottom$"], "tl_name" : "bottom" },
{"orig_name" : "soldbotm.art", "tl_name" : "sm_botm" }, {"orig_name" : ["soldbotm.art","^sm_botm$","bot_soldermask"], "tl_name" : "sm_botm" },
{"orig_name" : "sleg.art", "tl_name" : "silk_bot" }, {"orig_name" : ["sleg.art","^silk_bot$","bot_silkscreen"], "tl_name" : "silk_bot" },
{"orig_name" : "pastbotm.art", "tl_name" : "past_botm" }, {"orig_name" : ["pastbotm.art","^past_botm$","bot_solderpaste"], "tl_name" : "past_botm" },
{"orig_name" : "multipack.art", "tl_name" : "array" }, {"orig_name" : "multipack.art", "tl_name" : "array" },
{"orig_name" : ["outline.art","outline"], "tl_name" : "outline" }, {"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
{"orig_name" : ["outline.art","^outline$"], "tl_name" : "outline" },
{"orig_name" : ["fab.art","fab"], "tl_name" : "fab" }, {"orig_name" : ["fab.art","fab"], "tl_name" : "fab" },
{"orig_name" : "top-enig", "tl_name" : "top-enig" }, {"orig_name" : "top-enig", "tl_name" : "top-enig" },
{"orig_name" : "bot-enig", "tl_name" : "bot-enig" }, {"orig_name" : "bot-enig", "tl_name" : "bot-enig" },
...@@ -483,8 +482,8 @@ ...@@ -483,8 +482,8 @@
{"tl_name":"d_(\\d+)-(\\d+)","new_name":"d($1)-($2)" ,"attr":{"context":"board","type":"drill"}}, {"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"}}, {"tl_name":"drill","new_name":"drill" ,"attr":{"context":"board","type":"drill"}},
{"tl_name":"rout","new_name":"rout" ,"attr":{"context":"board","type":"rout"}}, {"tl_name":"rout","new_name":"rout" ,"attr":{"context":"board","type":"rout"}},
{"tl_name":"outline","new_name":"outline" ,"attr":{"context":"board","type":"rout"}},
{"tl_name":"array","new_name":"array" ,"attr":{"context":"misc"}}, {"tl_name":"array","new_name":"array" ,"attr":{"context":"misc"}},
{"tl_name":"outline","new_name":"outline" ,"attr":{"context":"misc"}},
{"tl_name":"fab.art","new_name":"fab.art" ,"attr":{"context":"misc"}} {"tl_name":"fab.art","new_name":"fab.art" ,"attr":{"context":"misc"}}
], ],
"delSameJob": "no" "delSameJob": "no"
......
test/ATS_AIM_customer_data_analysis-422.js 0 → 100644
View file @ ba8d156b
This diff is collapsed.
test/ATS_AIM_customer_data_analysis.js
View file @ ba8d156b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment