| 
					
				 | 
			
			
				@@ -2186,12 +2186,20 @@ namespace MOKA_Factory_Tools 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         goto end; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if ( !CommonMethod.GetIDMKeys(midListNow.host, SN, orderNow, psn, devicecode, errorDBNow, out keyInfo, out error) ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                // 部分订单无key,只有Roku信息; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (midListNow.keytype.Count() != 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ErrMsg = string.Format("{0} GetIDMKeys Failed!\r\n{1}", SN, error); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    Log.WriteErrorLog(ErrMsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    goto end; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if (!CommonMethod.GetIDMKeys(midListNow.host, SN, orderNow, psn, devicecode, errorDBNow, out keyInfo, out error)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        ErrMsg = string.Format("{0} GetIDMKeys Failed!\r\n{1}", SN, error); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        Log.WriteErrorLog(ErrMsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        goto end; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Log.WriteInfoLog("mid type is null, don't query idm keys"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (midListNow.keytype.ContainsKey("DSN")) 
			 |