|  |  |  | @ -333,6 +333,31 @@ namespace FactorySystemBll | 
			
		
	
		
			
				
					|  |  |  |  |                     result = db.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID)) | 
			
		
	
		
			
				
					|  |  |  |  |                         .Where((a, b) => a.FPlmCode.Equals(code1) && a.FVersionCode.Equals(code2) && b.FFactoryCode.Equals(code3)).Select<dynamic>(selectVal).ToList(); | 
			
		
	
		
			
				
					|  |  |  |  |                     break; | 
			
		
	
		
			
				
					|  |  |  |  |                 // 20230802 增加试验号 + 工厂查询 | 
			
		
	
		
			
				
					|  |  |  |  |                 case "5": | 
			
		
	
		
			
				
					|  |  |  |  |                     if (inParam.TryGetValue("SP_VALUE", out object objSpValue5)) code1 = objSpValue5.ToString(); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (inParam.TryGetValue("FFactoryCode", out object objFactoryCode5)) code2 = objFactoryCode5.ToString(); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |                     if (string.IsNullOrWhiteSpace(code1) || string.IsNullOrWhiteSpace(code2)) | 
			
		
	
		
			
				
					|  |  |  |  |                     { | 
			
		
	
		
			
				
					|  |  |  |  |                         return result; | 
			
		
	
		
			
				
					|  |  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  |  |                     result = db.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID)) | 
			
		
	
		
			
				
					|  |  |  |  |                         .Where((a, b) => a.FTestCode.Equals(code1) && b.FFactoryCode.Equals(code2)).Select<dynamic>(selectVal).ToList(); | 
			
		
	
		
			
				
					|  |  |  |  |                     break; | 
			
		
	
		
			
				
					|  |  |  |  |                 // 20230802 增加试验号 + 版本号 + 工厂查询 | 
			
		
	
		
			
				
					|  |  |  |  |                 case "6": | 
			
		
	
		
			
				
					|  |  |  |  |                     if (inParam.TryGetValue("SP_VALUE", out object objSpValue6)) code1 = objSpValue6.ToString(); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (inParam.TryGetValue("FFactoryCode", out object objFactoryCode6)) code2 = objFactoryCode6.ToString(); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (inParam.TryGetValue("SP_VERSION", out object objVersion6)) code3 = objVersion6.ToString(); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |                     if (string.IsNullOrWhiteSpace(code1) || string.IsNullOrWhiteSpace(code2) || string.IsNullOrWhiteSpace(code3)) | 
			
		
	
		
			
				
					|  |  |  |  |                     { | 
			
		
	
		
			
				
					|  |  |  |  |                         return result; | 
			
		
	
		
			
				
					|  |  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  |  |                     result = db.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID)) | 
			
		
	
		
			
				
					|  |  |  |  |                         .Where((a, b) => a.FTestCode.Equals(code1) && b.FFactoryCode.Equals(code2) && a.FVersionCode.Equals(code3)).Select<dynamic>(selectVal).ToList(); | 
			
		
	
		
			
				
					|  |  |  |  |                     break; | 
			
		
	
		
			
				
					|  |  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |  |             return result; | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
	
		
			
				
					|  |  |  | 
 |