From f314ea2477d0c8d439c96f91a4ae3fcada2a7add Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期三, 16 四月 2025 08:35:44 +0800 Subject: [PATCH] spc优化 --- WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 540 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 517 insertions(+), 23 deletions(-) diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" index 2ea5941..8becd27 100644 --- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" +++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" @@ -483,12 +483,14 @@ string HBeginDate = dic["HBeginDate"].ToString(); string HEndDate = dic["HEndDate"].ToString(); + string HDeptID = dic["HDeptID"].ToString(); int limit = int.Parse(dic["limit"].ToString()); int HQCCheckItemID = int.Parse(dic["HQCCheckItemID"].ToString()); int HMaterID = int.Parse(dic["HMaterID"].ToString()); string HMouldNum = dic["HMouldNum"].ToString(); + string HSourceID = dic["HSourceID"].ToString(); - ds = oCN.RunProcReturn("exec h_p_QC_InspectionFormReport '" + HBeginDate + "','" + HEndDate + "'," + limit + "," + HQCCheckItemID + "," + HMaterID + ",'" + HMouldNum + "'", "h_p_QC_InspectionFormReport"); + ds = oCN.RunProcReturn("exec h_p_QC_InspectionFormReport '" + HBeginDate + "','" + HEndDate + "'," + limit + "," + HQCCheckItemID + "," + HMaterID + ",'" + HMouldNum + "','"+ HSourceID + "','"+ HDeptID + "'", "h_p_QC_InspectionFormReport"); //娣诲姞鍒楀悕 foreach (DataColumn col in ds.Tables[0].Columns) @@ -548,8 +550,10 @@ string HProject = dic["HProject"].ToString();//椤圭洰鍙� string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇 string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮� + string HResult = dic["HResult"].ToString();//鍒ゆ柇缁撴灉 + string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О - ds = oCN.RunProcReturn("exec h_p_QC_QualityStatisticsDailyReport '" + HYear + "','" + HMonth + "'," + HDeptName + "," + HOrgID+ ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_QualityStatisticsDailyReport"); + ds = oCN.RunProcReturn("exec h_p_QC_QualityStatisticsDailyReport '" + HYear + "','" + HMonth + "'," + HDeptName + "," + HOrgID+ ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HResult + "','" + HProcName + "'", "h_p_QC_QualityStatisticsDailyReport"); //娣诲姞鍒楀悕 foreach (DataColumn col in ds.Tables[0].Columns) @@ -688,20 +692,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,'') 璁惧浠g爜,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) @@ -742,11 +746,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; @@ -755,7 +761,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) @@ -1191,8 +1197,13 @@ string HProject = dic["HProject"].ToString();//椤圭洰鍙� string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇 string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮� + string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠g爜 + string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О + string HBatchNo = dic["HBatchNo"].ToString();//鎵规鍙� + string HProjectNum = dic["HProjectNum"].ToString();//椤圭洰鍙� + string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О - ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_BadProductsReport"); + ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchNo + "','" + HProjectNum + "','"+ HProcName + "'", "h_p_QC_BadProductsReport"); //娣诲姞鍒楀悕 foreach (DataColumn col in ds.Tables[0].Columns) @@ -1468,7 +1479,8 @@ } #endregion - #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函 + #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函 + //SN鐮佽拷婧� [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")] [HttpGet] public object Get_QC_FiveMenOneRingList(string SN, string user) @@ -1478,6 +1490,58 @@ 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) + { + List<object> tableColumnList = new List<object>(); + + // 娣诲姞鍒楀悕 + foreach (DataColumn col in table.Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + tableColumnList.Add(JsonConvert.DeserializeObject(ColmString)); + } + + // 灏嗘瘡涓〃鐨勫垪鍚嶅垪琛ㄦ坊鍔犲埌鎬诲垪鍚嶅垪琛� + columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList }); + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + //榛戠櫧鏍囨煡璇� + [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_HB")] + [HttpGet] + public object Get_QC_FiveMenOneRingList_HB(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + + ds = oCN.RunProcReturn("select * from h_v_QC_FiveMenOneRingList_HB where 1=1 "+sWhere+" order by 鏃ユ湡 desc", "h_v_QC_FiveMenOneRingList_HB"); // 閬嶅巻鎵�鏈夎〃 foreach (DataTable table in ds.Tables) @@ -1512,17 +1576,45 @@ return objJsonResult; } } - - //鐐瑰嚮涓昏〃鏍肩殑娴佽浆鍗�,鏌ヨ瀛愯〃鏍兼暟鎹� - [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")] + + //闀洉鐮侀〉绛�-娴佽浆鍗″彿鏌ヨ杩斿洖娴佽浆鍗d + [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_HProcHBillNoID")] [HttpGet] - public object Get_QC_FiveMenOneRingList_Right(string linterid, string user) + public object Get_QC_FiveMenOneRingList_HProcHBillNoID(string HProcHBillNo, 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("select top 1 hmainid from h_v_Sc_ProcessExchangeBillList_Query where 鍗曟嵁鍙�= '"+ HProcHBillNo +"'", "h_v_Sc_ProcessExchangeBillList_Query"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + //鐐瑰嚮涓昏〃鏍肩殑娴佽浆鍗�,鏌ヨ瀛愯〃鏍兼暟鎹� + [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")] + [HttpGet] + 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 + "','"+ HProcID + "','" + SNs + "'", "h_p_QC_FiveMenOneRingList_Query"); // 閬嶅巻鎵�鏈夎〃 foreach (DataTable table in ds.Tables) @@ -1665,7 +1757,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) { @@ -1674,12 +1766,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) @@ -1708,5 +1802,405 @@ #endregion + #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函 鏍规嵁鍏ㄧ▼杩芥函鎶ヨ〃 娉� 鑾峰彇鐗╂枡+娴佽浆鍗�+璁惧+宸ュ簭 + + [Route("QC_CustomerAppealReport/Get_EquipICMOTechParamList")] + [HttpGet] + public object Get_EquipICMOTechParamList(string linterid, string HProcID, string user) + { + try + { + List<object> columnNameList = new List<object>(); + + ds = oCN.RunProcReturn("select a.HBillNo 宸ュ簭娴佽浆鍗″彿,e.HInterID 璁惧id,e.HEquipFileNumber 璁惧浠g爜,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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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/GetQC_QualityDailyReprot")] + [HttpGet] + public object GetQC_QualityDailyReprot(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + if (sWhere == null || sWhere == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒"; + objJsonResult.data = null; + return objJsonResult; + } + + Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere); + + + 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();//浜嬩笟閮� + string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О + string HReceiveMan = dic["HReceiveMan"].ToString();//鎿嶄綔鍛� + string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜 + string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О + string HBachNO_BCP = dic["HBachNO_BCP"].ToString();//鍗婃垚鍝佹壒娆� + string HBachNO_CP = dic["HBachNO_CP"].ToString();//鎴愬搧鎵规 + + ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot '" + HBeginDate + "','" + HEndDate + "','" + HBatchNo + "','" + HBatchNo1 + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "','" + HReceiveMan + "','" + HEquipNumber + "','" + HMaterName + "','" + HBachNO_BCP + "','" + HBachNO_CP + "'", "h_p_QC_QualityDailyReprot"); + + //娣诲姞鍒楀悕 + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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/GetQC_QualityDailyReprot_Sum")] + [HttpGet] + public object GetQC_QualityDailyReprot_Sum(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + if (sWhere == null || sWhere == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒"; + objJsonResult.data = null; + return objJsonResult; + } + + Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere); + + + string HBeginDate = dic["HBeginDate"].ToString(); + string HEndDate = dic["HEndDate"].ToString(); + string HProject = dic["HProject"].ToString();//椤圭洰鍙� + string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇 + string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮� + string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О + + ds = oCN.RunProcReturn("exec h_p_QC_QualityDailyReprot_Sum '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HProcName + "'", "h_p_QC_QualityDailyReprot_Sum"); + + //娣诲姞鍒楀悕 + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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/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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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闂 + ///鍙傛暟锛歴tring 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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/getQC_TechParamReport")] + [HttpGet] + public object getQC_TechParamReport(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere); + + string HBeginDate = dic["HBeginDate"].ToString(); + string HEndDate = dic["HEndDate"].ToString(); + string HProject = dic["HProject"].ToString();//椤圭洰鍙� + string HProcId = dic["HProcId"].ToString(); //宸ュ簭 + string Frequency = dic["Frequency"].ToString();//棰戞 + string HSourceID= dic["HSourceID"].ToString();//鐢熶骇璧勬簮 + + ds = oCN.RunProcReturn("exec h_p_TechParamReportList '" + Frequency + "','" + HProject + "','" + HProcId + "','" + HBeginDate + "','" + HEndDate + "','"+ HSourceID + "'", "h_p_TechParamReportList"); + + + //娣诲姞鍒楀悕 + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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/getQC_BackWorkReport")] + [HttpGet] + public object getQC_BackWorkReport(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere); + + string HBeginDate = dic["HBeginDate"].ToString(); + string HEndDate = dic["HEndDate"].ToString(); + string HProject = dic["HProject"].ToString();//椤圭洰鍙� + string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇 + string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮� + string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О + string HProcName = dic["HProcName"].ToString();//宸ュ簭鍚嶇О + string HBadReasonID = dic["HBadReasonID"].ToString();//涓嶈壇鍘熷洜 + + + ds = oCN.RunProcReturn("exec h_p_QC_BackWorkReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HDivisionName + "','" + HBatchWork + "','" + HMaterName + "','" + HProcName + "','" + HBadReasonID + "'", "h_p_QC_BackWorkReport"); + + + //娣诲姞鍒楀悕 + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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 + + } } -- Gitblit v1.9.1