MES-WEB-API.git

			@@ -690,20 +690,20 @@
			}
			#endregion

			#region è´¨éæ¨¡å è®¾å¤å·¥èºåæ°è¶å¿å¾ æ ¹æ®æµè½¬å¡è·åè®¾å¤+æ¨¡å·
			#region è´¨éæ¨¡å è®¾å¤å·¥èºåæ°è¶å¿å¾ æ ¹æ®æµè½¬å¡+å·¥åº è·åè®¾å¤

			[Route("QC_CustomerAppealReport/Get_EquipList")]
			[HttpGet]
			public object Get_EquipList(string HProcExchBillNo, string user)
			public object Get_EquipList(string HProcExchBillNo,string HProcID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HEquipFileNumber HEquipFileNumber,b.HName HName,d.HMouldNo HMouldNumber,d.HName HMouldName " +
			" from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain b on a.HEquipID=b.HInterID" +
			" left join Sc_ICMOBillStatus_Tmp c on a.HProcExchInterID = c.HSourceInterID and a.HProcExchEntryID = c.HSourceEntryID and a.HProcID = c.HProcID" +
			" left join Gy_MouldFileMain d on c.HMouldID = d.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
			ds = oCN.RunProcReturn("select isnull(c.HInterID,0)è®¾å¤id,isnull(c.HEquipFileNumber,'') è®¾å¤ä»£ç ,isnull(c.HName,'') è®¾å¤åç§°,b.HRelBeginDate å¼å§æ¶é´,b.HRelEndDate ç»ææ¶é´ from Sc_ProcessExchangeBillMain a " +
			" inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID" +
			" left join Gy_EquipFileBillMain c on b.HSourceID=c.HSourceID" +
			" where a.HBillNo='" + HProcExchBillNo + "'and b.HProcID='"+ HProcID + "' and b.HSourceID !=0 ", "Sc_ProcessExchangeBillMain");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			@@ -744,11 +744,13 @@
			Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

			string HProcExchBillNo = dic["HProcExchBillNo"].ToString();
			string HProcName = dic["HProcName"].ToString();
			string HProcID = dic["HProcID"].ToString();
			string HTechParamName = dic["HTechParamName"].ToString();
			string HEquipName = dic["HEquipName"].ToString();
			string HEquipID = dic["HEquipID"].ToString();
			string HBeginDate = dic["HBeginDate"].ToString();
			string HEndDate = dic["HEndDate"].ToString();

			if ((HProcExchBillNo == null \|\| HProcExchBillNo == "")&&(HProcName == null \|\| HProcName == "") && (HTechParamName == null \|\| HTechParamName == "") && (HEquipName == null \|\| HEquipName == ""))
			if ((HProcExchBillNo == null \|\| HProcExchBillNo == "")&&(HProcID == null \|\| HProcID == "") && (HTechParamName == null \|\| HTechParamName == "") && (HEquipID == null \|\| HEquipID == ""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -757,7 +759,7 @@
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"','"+Type+"'", "h_p_SB_EquipICMOTechParamBillList");
			ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcID + "','" + HTechParamName + "','"+ HEquipID + "','" + HBeginDate + "','" + HEndDate + "','" + Type+"'", "h_p_SB_EquipICMOTechParamBillList");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			@@ -1486,7 +1488,14 @@
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList '" + SN + "'", "h_p_QC_FiveMenOneRingList");

			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤æ¡ç æ¥æ æ°æ®!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			// éåææè¡¨
			foreach (DataTable table in ds.Tables)
			{
			@@ -1597,13 +1606,13 @@
			//ç¹å»ä¸»è¡¨æ ¼çæµè½¬å¡,æ¥è¯¢åè¡¨æ ¼æ°æ®
			[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
			[HttpGet]
			public object Get_QC_FiveMenOneRingList_Right(string linterid, 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 + "'", "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)
			@@ -1746,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)
			{
			@@ -1755,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)
			@@ -1793,14 +1804,64 @@

			[Route("QC_CustomerAppealReport/Get_EquipICMOTechParamList")]
			[HttpGet]
			public object Get_EquipICMOTechParamList(string linterid, string user)
			public object Get_EquipICMOTechParamList(string linterid, string HProcID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn(@"select a.HProcExchBillNo,g.HEquipFileNumber,g.HName è®¾å¤åç§°,b.HName ç©æåç§°,h.HName å·¥åºåç§° from SB_EquipICMOTechParamBillMain a left join Gy_Material b on a.HMaterID = b.HItemID
			left join Gy_Source e on a.HSourceID = e.HItemID left join Gy_EquipFileBillMain g on a.HEquipID = g.HInterID left join Gy_Process h on a.HProcID = h.HItemID", "SB_EquipICMOTechParamBillMain");
			ds = oCN.RunProcReturn("select a.HBillNo å·¥åºæµè½¬å¡å·,e.HInterID è®¾å¤id,e.HEquipFileNumber è®¾å¤ä»£ç ,e.HName è®¾å¤åç§°,d.HName çäº§èµæº,a.HMaterID ç©æid,c.HName ç©æåç§°,b.HProcID å·¥åºid,f.HName å·¥åºåç§°,b.HRelBeginDate å¼å§æ¶é´,b.HRelEndDate ç»ææ¶é´ " +
			"from Sc_ProcessExchangeBillMain a inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
			"left join Gy_Material c on a.HMaterID = c.HItemID left join Gy_Source d on b.HSourceID = d.HItemID " +
			"left join Gy_EquipFileBillMain e on b.HSourceID = e.HSourceID and b.HSourceID<>0 left join Gy_Process f on b.HProcID = f.HItemID where a.HInterID='" + linterid+ "' and b.HProcID='"+HProcID+"'", "SB_EquipICMOTechParamBillMain");
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region è´¨éæ¨¡å è®¾å¤å·¥èºåæ°è¶å¿å¾ æ ¹æ®ç©æ+è®¾å¤+å·¥åº è·å äº§åå·¥èºåæ°æ¸å å·¥èºåæ°

			[Route("QC_CustomerAppealReport/Get_TechParamList")]
			[HttpGet]
			public object Get_TechParamList(string HMaterID, string HProID, string HEquId, string HTeachName, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			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");
			}
			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)
			{
			@@ -1850,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();//äºä¸é¨
			@@ -1857,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)
			@@ -1939,5 +2001,102 @@
			}
			}
			#endregion

			#region è´¨éæ¨¡å æåº¦æ¥å æ¥è¯¢

			[Route("QC_CustomerAppealReport/GetQC_QualityMonthReportList")]
			[HttpGet]
			public object GetQC_QualityMonthReportList(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

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


			ds = oCN.RunProcReturn("exec h_p_QC_QualityMonthReport '" + HYear + "','" + HMonth + "','" + HDivisionName + "','" + HProject + "','" + HBatchWork + "'", "h_p_QC_QualityMonthReport");


			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region è´¨éæ¨¡å è®¾å¤TOP3é®é¢
			/// <summary>
			/// è¿åè®¾å¤TOP3é®é¢
			///åæ°ï¼string sqlã
			///è¿åå¼ï¼objectã
			/// </summary>
			[Route("QC_CustomerAppealReport/GetQC_BadReasonTop3ReportList")]
			[HttpGet]
			public object GetQC_BadReasonTop3ReportList(string sWhere, string user)
			{
			try
			{
			Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

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

			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("exec h_p_QC_BadReasonTop3Report '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_BadReasonTop3Report");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}