scott

ats/topcam/ATS_AIM_customer_data_analysis.js

@@ -982,7 +982,26 @@ try {
 		GEN.checkInout({job:job,mode:"in"})
 	}
 
+    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.readin_result = "已读入"
 
+	db.query("",function(q){
+		return q.updateRow({
+			table:'pdm_job',
+			data:{job_attrs:job_attrs},
+			update_policy:{attr_data:'json_merge'},
+			where:{id : JobId}
+		})
+	});
+    
     IKM.msg("export")
     
 
@@ -1012,11 +1031,12 @@ try {
 		})
 	});
     var err = mail.sendMail({
-        host:'smtp.exmail.qq.com',
+        host:'cshas.ats.net',
+        port:"25",
         auth_method:mail.AuthMethod.LOGIN,
         connection_type:mail.ConnectionType.TCP,
-        from:'scott.sun@topibd.com',
-        password:'159482673Sun',
+        // user:'ferre.zhang@cn.ats.net',
+        // password:'159482673Sun',
         to:'scott.sun@topibd.com',
         subject:db_customer + ' / '+job+' reading is ready！',
         content:db_customer + ' / '+job+' reading is ready！'
@@ -1025,8 +1045,6 @@ try {
         print(err.text());
     }
 
-
-
 	if (mode === "aimdfm") {
 		$.QDfm.updateRow({
 			table: "pdm_aimdfm_task",

ats/topcam/ATS_AIM_data_input.js

@@ -86,7 +86,8 @@ if (mode === "aimdfm") {
 }
 var Status = 'ok';
 var resultData = [];
-var import_info = []
+var import_info = [];
+var inputState = [];
 try {
 	script_info({ result_severity: "import start" })
 	var par = PAR;
@@ -168,7 +169,30 @@ try {
 	
 	// 将jobFile下的zip解压
 	decompression(jobFile[0].path, [])
-	
+
+	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 = {}} 
+	if (inputState.indexOf("rar") >=0 || inputState.indexOf("7z") >=0) {
+		job_attrs.readin_result = "解压失败-格式无法识别"
+	} else {
+		job_attrs.readin_result = "已读入"
+	}
+	db.query("",function(q){
+		return q.updateRow({
+			table:'pdm_job',
+			data:{job_attrs:job_attrs},
+			update_policy:{attr_data:'json_merge'},
+			where:{id : JobId}
+		})
+	});
+
 	jobFiles = fs.listDir(jobFile[0].path)
 
 	// 分析料号文件 得到料号导入信息 导入类型
@@ -515,6 +539,9 @@ function decompression(path, zips) {
 	var files = fs.listDir(path)
 	var count = 0;
 	var zipfiles = files.filter(function(item){
+		if (item.suffix == "zip" || item.suffix == "rar" || item.suffix == "7z") {
+			inputState.push(item.suffix)
+		}
 		if(item.suffix === "zip" && zips.indexOf(item.path) < 0){
 			if(item.name.length >= 20) {
 				var mvname = "zip_custom" + count + ".zip";

ats/topcam/create_work.js

-"use strict";
 var fs = require("fs");
 var db = require('topsin.database');
 var error = require('topsin.error');
@@ -20,10 +19,8 @@ try {
     if (query_1.lastError().isValid()){
         throw query_1.lastError().text()};
     // 获取远程文件夹
-    console.log(1);
     var samba = fs.listDir("\\\\10.90.2.100\\samba", 1);
-    console.log(2);
-    throw "tmp"
+
     var sambaDirs_1 = [];
     var sambaFiles_1 = [];
     samba.forEach(function (v) {

ats/topcam/emai.js

-let mail = require('topsin.mail');
-let error = require('topsin.error');
+var mail = require('topsin.mail');
+var error = require('topsin.error');
 var err = mail.sendMail({
-    host:'smtp.exmail.qq.com',
-    auth_method:mail.AuthMethod.LOGIN,
-    connection_type:mail.ConnectionType.TCP,
-    from:'scott.sun@topibd.com',
-    password:'159482673Sun',
+    // host:'smtp.exmail.qq.com',
+    // host:'cshas.ats.net',
+    host:"cshas.ats.net",
+    port: "25",
+    // auth_method:mail.AuthMethod.LOGIN,
+    // connection_type:mail.ConnectionType.TCP,
+    // user: "ferre.zhang@cn.ats.net",
+    // user:'scott.sun@topibd.com',
+    // password:'159482673Sun',
     to:'scott.sun@topibd.com',
     subject:'customer_code / job_name reading is ready！',
     content:'customer_code / job_name reading is ready！'
@@ -13,4 +17,7 @@ var err = mail.sendMail({
 
 if (err.isValid()) {
     print(err.text());
-}
\ No newline at end of file
+}
+
+
+

public_script/silkScreenOptimize.js

@@ -178,17 +178,17 @@ try {
 	var workstep = getWorkStep()
 	if(!Array.isArray(workstep)){throw "工作step错误"}
 
-    // var err = createCoverLayer({workstep:workstep})  // 创建套层
-	// if (err) {throw err}
-	// GEN.PAUSE("createCoverLayer end; please check")
+    var err = createCoverLayer({workstep:workstep})  // 创建套层
+	if (err) {throw err}
+	GEN.PAUSE("createCoverLayer end; please check")
 
-	// var err = ssFrameSeparate({workstep:workstep}) // 分离文字和文字框
-	// if (err) {throw err}
-	// GEN.PAUSE("ssFrameSeparate end; please check")
+	var err = ssFrameSeparate({workstep:workstep}) // 分离文字和文字框
+	if (err) {throw err}
+	GEN.PAUSE("ssFrameSeparate end; please check")
 
-	// var err = slBoxOptimize({workstep:workstep}) // 文字框优化
-	// if (err) {throw err}
-	// GEN.PAUSE("slBoxOptimize end; please check")
+	var err = slBoxOptimize({workstep:workstep}) // 文字框优化
+	if (err) {throw err}
+	GEN.PAUSE("slBoxOptimize end; please check")
 
 	var err = slOptimize({workstep:workstep}) // 文字优化
 	if (err) {throw err}