From 20879fb51927c6a192fe50b6fe5ab19600d83641 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 24 十月 2024 20:04:10 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 283 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 218 insertions(+), 65 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 27c8be5..09c530c 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"
@@ -545,8 +545,13 @@
string HMonth = dic["HMonth"].ToString();
int HDeptName = int.Parse(dic["HDeptName"].ToString());
int HOrgID = int.Parse(dic["HOrgID"].ToString());
+ 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, "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)
@@ -603,8 +608,11 @@
string HEndDate = dic["HEndDate"].ToString();
string HResult = dic["HResult"].ToString();
int HSourceID = int.Parse(dic["HSourceID"].ToString());
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
- ds = oCN.RunProcReturn("exec h_p_QC_MoistureContentDataLedger '" + HBeginDate + "','" + HEndDate + "','" + HResult + "'," + HSourceID, "h_p_QC_MoistureContentDataLedger");
+ ds = oCN.RunProcReturn("exec h_p_QC_MoistureContentDataLedger '" + HBeginDate + "','" + HEndDate + "','" + HResult + "'," + HSourceID+ ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_MoistureContentDataLedger");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -640,17 +648,21 @@
{
try
{
- List<object> columnNameList = new List<object>();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBillQuery_HProc order by 鏃ユ湡 desc", "h_v_Sc_StationOutBillQuery_HProc");
- }
- else
- {
- string sql1 = "select * from h_v_Sc_StationOutBillQuery_HProc where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鏃ユ湡 ";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_StationOutBillQuery_HProc");
- }
+ 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 HProcName = dic["HProcName"].ToString();
+ string HMaterName = dic["HMaterName"].ToString();
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDeptID = dic["HDeptID"].ToString();//閮ㄩ棬
+
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_StationOutBillQuery_HProc '" + HYear + "','" + HMonth + "','" + HDivisionName + "','" + HProcName + "','" + HMaterName + "','" + HProject + "','" + HBatchWork + "','"+ HDeptID + "'", "h_p_SB_EquipICMOTechParamBillList");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -723,7 +735,7 @@
[Route("QC_CustomerAppealReport/SB_EquipICMOTechParamList")]
[HttpGet]
- public object SB_EquipICMOTechParamList(string sWhere, string user)
+ public object SB_EquipICMOTechParamList(string sWhere, string user,string Type)
{
try
{
@@ -745,7 +757,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"'", "h_p_SB_EquipICMOTechParamBillList");
+ ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "','"+HEquipName+"','"+Type+"'", "h_p_SB_EquipICMOTechParamBillList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -856,8 +868,11 @@
string HEndDate = dic["HEndDate"].ToString();
string HBatchNo = dic["HBatchNo"].ToString();
int HMaterID = int.Parse(dic["HMaterID"].ToString());
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
- ds = oCN.RunProcReturn("exec h_p_QC_PerformanceScrapLedger '" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HBatchNo+"'", "h_p_QC_PerformanceScrapLedger");
+ ds = oCN.RunProcReturn("exec h_p_QC_PerformanceScrapLedger '" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HBatchNo+ "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_PerformanceScrapLedger");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -914,8 +929,11 @@
string HEndDate = dic["HEndDate"].ToString();
string HBatchNo = dic["HBatchNo"].ToString();
int HMaterID = int.Parse(dic["HMaterID"].ToString());
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
- ds = oCN.RunProcReturn("exec h_p_QC_RegistrationForTestingReport '" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HBatchNo + "'", "h_p_QC_RegistrationForTestingReport");
+ ds = oCN.RunProcReturn("exec h_p_QC_RegistrationForTestingReport '" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HBatchNo + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_RegistrationForTestingReport");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -956,14 +974,13 @@
Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
string HYear = dic["HYear"].ToString();//骞�
- string HDeptName = dic["HDeptName"].ToString();//閮ㄩ棬
string HProject = dic["HProject"].ToString();//椤圭洰鍙�
string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
- ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformanceFirstPassList '" + HYear + "','"+ HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformanceFirstPassList");
+ ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformanceFirstPassList '" + HYear + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformanceFirstPassList");
//娣诲姞鍒楀悕
@@ -1005,14 +1022,13 @@
Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
string HYear = dic["HYear"].ToString();//骞�
- string HDeptName = dic["HDeptName"].ToString();//閮ㄩ棬
string HProject = dic["HProject"].ToString();//椤圭洰鍙�
string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
- ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformancePassList '" + HYear + "','" + HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformancePassList");
+ ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformancePassList '" + HYear + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformancePassList");
//娣诲姞鍒楀悕
@@ -1057,7 +1073,7 @@
else
{
string sql1 = "select * from h_v_OA_ErrMsgBackBillList_Query where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鏃ユ湡 ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc ";
ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillList_Query");
}
@@ -1115,13 +1131,11 @@
string HBeginDate = dic["HBeginDate"].ToString();
string HEndDate = dic["HEndDate"].ToString();
int HDeptID = int.Parse(dic["HDeptID"].ToString());
- string HMaterModel = dic["HMaterModel"].ToString();
- string HSourceName = dic["HSourceName"].ToString();
- string HProSource = dic["HProSource"].ToString();
- string HShiftsName = dic["HShiftsName"].ToString();
- string HCustomize = dic["HCustomize"].ToString();
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
- ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport '" + HBeginDate + "','" + HEndDate + "'," + HDeptID + ",'" + HMaterModel + "','" + HSourceName + "','" + HProSource + "','" + HShiftsName + "','" + HCustomize + "'", "h_p_QC_ErrManagerLedgerReport");
+ ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport '" + HBeginDate + "','" + HEndDate + "'," + HDeptID + ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ErrManagerLedgerReport");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1176,14 +1190,16 @@
string HBeginDate = dic["HBeginDate"].ToString();
string HEndDate = dic["HEndDate"].ToString();
- string HMaterNumber = dic["HMaterNumber"].ToString();
- string HMaterModel = dic["HMaterModel"].ToString();
- string HProcessName = dic["HProcessName"].ToString();
- string HDealingType = dic["HDealingType"].ToString();
- string HSendManName = dic["HSendManName"].ToString();
- string HCustomize = dic["HCustomize"].ToString();
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+ string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
+ 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 + "','" + HMaterNumber + "','" + HMaterModel + "','" + HProcessName + "','" + HDealingType + "','" + HSendManName + "','" + HCustomize + "'", "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)
@@ -1219,13 +1235,24 @@
/// </summary>
[Route("QC_CustomerAppealReport/QC_ErrManagerLedgerReport_Source")]
[HttpGet]
- public object QC_ErrManagerLedgerReport_Source(string HYear, string HMonth, string user)
+ public object QC_ErrManagerLedgerReport_Source(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_ErrManagerLedgerReport_Source '" + HYear + "','" + HMonth + "'", "h_p_QC_ErrManagerLedgerReport_Source");
+ ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport_Source '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ErrManagerLedgerReport_Source");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1261,13 +1288,20 @@
/// </summary>
[Route("QC_CustomerAppealReport/QC_ErrManagerLedgerReport_Issue")]
[HttpGet]
- public object QC_ErrManagerLedgerReport_Issue(string HYear, string HMonth, string user)
+ public object QC_ErrManagerLedgerReport_Issue(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_ErrManagerLedgerReport_Issue '" + HYear + "','" + HMonth + "'", "h_p_QC_ErrManagerLedgerReport_Issue");
+ ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport_Issue '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ErrManagerLedgerReport_Issue");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1303,13 +1337,21 @@
/// </summary>
[Route("QC_CustomerAppealReport/QC_ErrManagerLedgerReport_SourceOfTheProblem")]
[HttpGet]
- public object QC_ErrManagerLedgerReport_SourceOfTheProblem(string HYear, string HMonth, string user)
+ public object QC_ErrManagerLedgerReport_SourceOfTheProblem(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_ErrManagerLedgerReport_SourceOfTheProblem '" + HYear + "','" + HMonth + "'", "h_p_QC_ErrManagerLedgerReport_SourceOfTheProblem");
+ ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport_SourceOfTheProblem '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ErrManagerLedgerReport_SourceOfTheProblem");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1345,13 +1387,21 @@
/// </summary>
[Route("QC_CustomerAppealReport/QC_ErrManagerLedgerReport_EquipTop3Issue")]
[HttpGet]
- public object QC_ErrManagerLedgerReport_EquipTop3Issue(string HYear, string HMonth, string user)
+ public object QC_ErrManagerLedgerReport_EquipTop3Issue(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_ErrManagerLedgerReport_EquipTop3Issue '" + HYear + "','" + HMonth + "'", "h_p_QC_ErrManagerLedgerReport_EquipTop3Issue");
+ ds = oCN.RunProcReturn("exec h_p_QC_ErrManagerLedgerReport_EquipTop3Issue '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ErrManagerLedgerReport_EquipTop3Issue");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1389,16 +1439,15 @@
{
List<object> columnNameList = new List<object>();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam order by 閲囬泦鏃ユ湡 desc", "h_v_Sb_EquipMentCollectionTechParam");
- }
- else
- {
- string sql1 = "select * from h_v_Sb_EquipMentCollectionTechParam where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 閲囬泦鏃ユ湡 ";
- ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMentCollectionTechParam");
- }
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+ string HTechParamName = dic["HTechParamName"].ToString();//宸ヨ壓浜ф暟
+ string HDate = dic["HDate"].ToString();//閲囬泦鏃ユ湡
+ string HDate1 = dic["HDate1"].ToString();//閲囬泦鏃ユ湡
+ string HEquipType = dic["HEquipType"].ToString();//鏌ヨ绫诲瀷
+
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParam '"+ HEquipNumber + "','"+ HTechParamName + "','"+ HDate + "','"+ HDate1 + "','"+ HEquipType + "'", "h_p_Sb_EquipMentCollectionTechParam");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1426,12 +1475,7 @@
}
#endregion
- #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
- /// <summary>
- /// 杩斿洖寮傚父闂鏉ユ簮
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
[Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
[HttpGet]
public object Get_QC_FiveMenOneRingList(string SN, string user)
@@ -1475,6 +1519,52 @@
return objJsonResult;
}
}
+
+ //鐐瑰嚮涓昏〃鏍肩殑娴佽浆鍗�,鏌ヨ瀛愯〃鏍兼暟鎹�
+ [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList_Right(string linterid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "'", "h_p_QC_FiveMenOneRingList_Query");
+
+ // 閬嶅巻鎵�鏈夎〃
+ 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;
+ }
+ }
+
#endregion
#region 璐ㄩ噺妯″潡 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
@@ -1485,11 +1575,20 @@
/// <returns></returns>
[Route("QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json")]
[HttpGet]
- public object GetQC_SkillExamMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
+ public object GetQC_SkillExamMonthSumReport_Json(string sWhere)
{
try
{
- ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_SkillExamMonthSumReport");
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HYear = dic["HYear"].ToString();//骞�
+ string HDeptID = dic["HDeptID"].ToString();//閮ㄩ棬
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+ ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString()+",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_SkillExamMonthSumReport");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1526,11 +1625,19 @@
/// <returns></returns>
[Route("QC_QualityReportsController/GetQC_QualityMonthSumReport_Json")]
[HttpGet]
- public object GetQC_QualityMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
+ public object GetQC_QualityMonthSumReport_Json(string sWhere)
{
try
{
- ds = oCN.RunProcReturn("exec h_p_QC_QualityMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_QualityMonthSumReport");
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HYear = dic["HYear"].ToString();//骞�
+ string HDeptID = dic["HDeptID"].ToString();//閮ㄩ棬
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+ ds = oCN.RunProcReturn("exec h_p_QC_QualityMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString() + ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_QualityMonthSumReport");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1567,11 +1674,19 @@
/// <returns></returns>
[Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
[HttpGet]
- public object GetQC_PPMReport_Json(Int64 HYear, Int64 HDeptID)
+ public object GetQC_PPMReport_Json(string sWhere)
{
try
{
- ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_PPMReport");
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HYear = dic["HYear"].ToString();//骞�
+ string HDeptID = dic["HDeptID"].ToString();//閮ㄩ棬
+ string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+ string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+ string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+ ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString() + ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_PPMReport");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1600,5 +1715,43 @@
#endregion
+ #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函 鏍规嵁鍏ㄧ▼杩芥函鎶ヨ〃 娉� 鑾峰彇鐗╂枡+娴佽浆鍗�+璁惧+宸ュ簭
+
+ [Route("QC_CustomerAppealReport/Get_EquipICMOTechParamList")]
+ [HttpGet]
+ public object Get_EquipICMOTechParamList(string linterid, 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");
+ //娣诲姞鍒楀悕
+ 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