Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/resources/templates/views/gygl/gylx/edit.html

@@ -153,6 +153,7 @@
         var $edtJghs = $div.find('input[name="jghs"]');
         var $edtZyhs = $div.find('input[name="zyhs"]');
         var $bInit = true;
+		var apigzzxid=""
 
         function pageInit(ops){
             //$cbxGcid.iCombobox({valueField:'id', textField:'name', onSelect: doSelectGcid});
@@ -212,6 +213,7 @@
         }*/
 		
         function doSelectGzzxid(a){
+			apigzzxid=a.id
             if( $div.closest("form").attr("tag")!="add" && $bInit) return false;
             gas.post('gygl/bzgx/queryNotTybzBzgx', {gzzxid: a.id}, function(res){
                 if (res.success && res.data.records){
@@ -237,7 +239,7 @@
             });
         }
 		function doldbzgx(e){
-			gas.post('gygl/bzgx/queryNotTybzBzgx', {gxlx:e.id}, function(res){
+			gas.post('gygl/bzgx/queryNotTybzBzgx', {gxlx:e.id,gzzxid:apigzzxid}, function(res){
 			    if (res.success && res.data.records){
 					$cbxBzgxid.iCombobox('setValue', '');
 			        $cbxBzgxid.iCombobox('loadData', res.data.records);

gavel/src/main/resources/templates/views/kmes/gphy/index.html

@@ -129,7 +129,7 @@
 						let msg=res.message||"查询WOSNID:"+that.wosncode+"成功"
 						zpfk_wrz(that,msg)	
 					}else if(res.data.records.sntype=="WLID"){
-						let msg=res.message||"查询:WLID"+that.wosncode+"成功"
+						let msg=res.message||"当前装配SN:"+that.wosncode+";品号"+res.data.records.curwlsncode+";品名"+res.data.records.curwlsnname+"成功！"
 						zpfk_wrz(that,msg)	
 					}
 					that.xlh=""