s

GUI测试/需求.md

+## tableEdit
+
+* 如图tableedit.png
+* 表格里每一行可以自定义控件 编辑 返回arrayHash结构数据
+
+
+## 显示提示信息
+* show_loading("正在....")     显示提示信息
+* update_loading("挑选铜皮重....")   更新提示信息
+* hide_loading()    关闭提示信息

ats/topcam/20200928_vivo.md

@@ -2,4 +2,8 @@
 
 * 100 102~106 108~113 115~116 119~127 129~130 132~142 145~150  rar压缩包
 * 107 114 117 118 128 131无文件
-* 144 创建profile失败
\ No newline at end of file
+* 144 创建profile失败
+
+
+
+99990110 99990113 创建profile的时候卡死
\ No newline at end of file

ats/topcam/ATS_AIM_data_format.js

@@ -829,17 +829,27 @@ function reName(props) { // 改名 par{job:要改名的料号, rule: {要改名
 	var matrix = props.matrix
 	var cfg = props.cfg
 
-	matrix = matrix.filter(function(v){return v.name != v.new_name})
-	
-	matrix.forEach(function(v){
+	matrix = matrix.filter(function(v){
+		if(v.name == v.new_name){
+			IKM.save_layerinfo({ jobid: JobId, layer: v.name, layerinfohash: { layer_name_final: v.new_name }})
+		}
+		return v.name != v.new_name
+	})
+	var tmp = [];
+	matrix = matrix.filter(function(v){
 		// 在数据库层信息里找v.name 找得到就直接改名
-		var new_name = IKM.get_layerinfo({jobid: JobId, layer: v.name, layerinfo: "new_name" })
+		var new_name = IKM.get_layerinfo({jobid: JobId, layer: v.name, layerinfo: "layer_name_final" })
 		var layers_tmp = Object.keys(GEN.getMatrix({job:job}));
 		if(new_name && new_name!="" && new_name != v.name && layers_tmp.indexOf(new_name) < 0){
+			IKM.save_layerinfo({ jobid: JobId, layer: v.name, layerinfohash: { layer_name_final: new_name }})
+			tmp.push(v.name + " ---- " +new_name)
 			GEN.renameLayer({job:job,layer:v.name,new_name:new_name})
+			return false
+		} else {
+			return true
 		}
 	})
-	
+
 	if(matrix.length > 0){
 		var rename_list = matrix.map(function(item){
 			var new_name;
@@ -893,6 +903,7 @@ function reName(props) { // 改名 par{job:要改名的料号, rule: {要改名
 		rename_list.forEach(function(v){
 			var layers_tmp = Object.keys(GEN.getMatrix({job:job}));
 			if(v.orig_name !== v.new_name && layers_tmp.indexOf(v.new_name) < 0){
+				IKM.save_layerinfo({ jobid: JobId, layer: v.orig_name, layerinfohash: { layer_name_final: v.new_name }})
 				GEN.renameLayer({job:job,layer:v.orig_name,new_name:v.new_name})
 			}
 		});
@@ -906,11 +917,13 @@ function reName(props) { // 改名 par{job:要改名的料号, rule: {要改名
 	var botSignal = signals[signals.length -1]
 	if(topSignal !== "top"){
 		if(!GEN.isLayerExists({job:job, layer:"top"})){
+			IKM.save_layerinfo({ jobid: JobId, layer: topSignal, layerinfohash: { layer_name_final: "top" }})
 			GEN.renameLayer({job:job,layer:topSignal,new_name:"top"})
 		}
 	}
 	if(botSignal !== "bottom"){
 		if(!GEN.isLayerExists({job:job, layer:"bottom"})){
+			IKM.save_layerinfo({ jobid: JobId, layer: botSignal, layerinfohash: { layer_name_final: "bottom" }})
 			GEN.renameLayer({job:job,layer:botSignal,new_name:"bottom"})
 		}
 	}