MES-WEB-API.git

			@@ -1606,13 +1606,13 @@
			//ç¹å»ä¸»è¡¨æ ¼çæµè½¬å¡,æ¥è¯¢åè¡¨æ ¼æ°æ®
			[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
			[HttpGet]
			public object Get_QC_FiveMenOneRingList_Right(string linterid,string SNs, string user)
			public object Get_QC_FiveMenOneRingList_Right(string linterid,string HProcID,string SNs, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");
			ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "','"+ HProcID + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query");

			// éåææè¡¨
			foreach (DataTable table in ds.Tables)
			@@ -1755,7 +1755,7 @@
			/// PPMç»©æè¶å¿å¾æ¥è¡¨
			/// </summary>
			/// <returns></returns>
			[Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
			[Route("QC_CustomerAppealReport/GetQC_PPMReport_Json")]
			[HttpGet]
			public object GetQC_PPMReport_Json(string sWhere)
			{
			@@ -1764,12 +1764,14 @@
			Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

			string HYear = dic["HYear"].ToString();//å¹´
			string HDeptID = dic["HDeptID"].ToString();//é¨é¨
			string HMonth = dic["HMonth"].ToString();//æ
			string HSupID = dic["HSupID"].ToString();//ä¾åºå
			string HDivisionName = dic["HDivisionName"].ToString();//äºä¸é¨
			string HProject = dic["HProject"].ToString();//é¡¹ç®å·
			string HBatchWork = dic["HBatchWork"].ToString();//æ¯å¦éäº§
			string HDivisionName = dic["HDivisionName"].ToString();//äºä¸é¨
			string HDeptID = dic["HDeptID"].ToString();//é¨é¨

			ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString() + ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_PPMReport");
			ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear + "','" + HMonth + "','" + HDivisionName + "','" + HProject + "','" + HBatchWork + "','" + HDeptID + "','" + HSupID + "'", "h_p_QC_PPMReport");
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			@@ -1842,15 +1844,24 @@

			[Route("QC_CustomerAppealReport/Get_TechParamList")]
			[HttpGet]
			public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string user)
			public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string HTeachName, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("select c.HName å·¥èºåæ°,b.HDataForm ééæ¥æº from Gy_MaterialTechParamBillMain a " +
			if (HTeachName=="")
			{
			ds = oCN.RunProcReturn("select c.HName å·¥èºåæ°,b.HDataForm ééæ¥æº from Gy_MaterialTechParamBillMain a " +
			"inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
			"left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='"+ HProID + "' and a.HEquipID='"+ HEquId + "'", "SB_EquipICMOTechParamBillMain");
			"left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "'", "SB_EquipICMOTechParamBillMain");
			}
			else
			{
			ds = oCN.RunProcReturn("select c.HName å·¥èºåæ°,b.HDataForm ééæ¥æº from Gy_MaterialTechParamBillMain a " +
			"inner join Gy_MaterialTechParamBillSub b on a.HInterID = b.HInterID " +
			"left join Gy_TechnologyParameter c on b.HTechParamID = c.HItemID where a.HMaterID='" + HMaterID + "' and a.HProcID='" + HProID + "' and a.HEquipID='" + HEquId + "' and c.HName ='" + HTeachName + "'", "SB_EquipICMOTechParamBillMain");
			}

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			@@ -1900,6 +1911,7 @@
			string HBeginDate = dic["HBeginDate"].ToString();
			string HEndDate = dic["HEndDate"].ToString();
			string HBatchNo = dic["HBatchNo"].ToString();//æ¹æ¬¡å·
			string HBatchNo1 = dic["HBatchNo1"].ToString();//IDå·
			string HProject = dic["HProject"].ToString();//é¡¹ç®å·
			string HBatchWork = dic["HBatchWork"].ToString();//æ¯å¦éäº§
			string HDivisionName = dic["HDivisionName"].ToString();//äºä¸é¨
			@@ -1907,7 +1919,7 @@
			string HReceiveMan = dic["HReceiveMan"].ToString();//æä½å
			string HEquipNumber = dic["HEquipNumber"].ToString();//è®¾å¤ç¼ç

			ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot '" + HBeginDate + "','" + HEndDate + "','" + HBatchNo + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "','" + HReceiveMan + "','" + HEquipNumber + "'", "h_p_QC_QualityDailyReprot");
			ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot '" + HBeginDate + "','" + HEndDate + "','" + HBatchNo + "','" + HBatchNo1 + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "','" + HReceiveMan + "','" + HEquipNumber + "'", "h_p_QC_QualityDailyReprot");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)