From a66f7508a14e0fcac2c8d15ea540905a9ba0227b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 八月 2025 09:33:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 246 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 241 insertions(+), 5 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 ddf66cb..e19df54 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,15 @@
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();
+ string HProcID = dic["HProcID"].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 + "','"+ HProcID + "'", "h_p_QC_InspectionFormReport");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1686,7 +1689,7 @@
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
- //}
+
}
catch (Exception e)
{
@@ -1911,14 +1914,18 @@
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 HSourceID = dic["HSourceID"].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 + "','" + 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 + "','" + HSourceID + "','" + HMaterName + "','" + HBachNO_BCP + "','" + HBachNO_CP + "'", "h_p_QC_QualityDailyReprot");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -2067,10 +2074,11 @@
string HProject = dic["HProject"].ToString();//椤圭洰鍙�
string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+ string HDepartment = dic["HDepartment"].ToString();//杞﹂棿
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_QC_BadReasonTop3Report '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_BadReasonTop3Report");
+ ds = oCN.RunProcReturn("exec h_p_QC_BadReasonTop3Report '" + HYear + "','" + HMonth + "','" + HProject + "','" + HBatchWork + "','"+ HDepartment + "','" + HDivisionName + "'", "h_p_QC_BadReasonTop3Report");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -2097,5 +2105,233 @@
}
}
#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
+
+ #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函 (鏍规嵁鐢熶骇璁㈠崟鏌ヨ)
+ //椤甸潰鍒濆鍖栧姞杞�
+ [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_HICM")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList_HICM(string HICMOBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_HICM '" + HICMOBillNo + "'", "h_p_QC_FiveMenOneRingList_HICM");
+ 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_HICMOBillNoID")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList_HICMOBillNoID(string HICMOBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select top 1 hmainid,HEntryID from h_v_IF_ICMOBillList where 鍗曟嵁鍙�= '" + HICMOBillNo + "'", "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_ICM")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList_Right_ICM(string linterid, string HEntryID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query_HICM '" + linterid + "','" + HEntryID + "'", "h_p_QC_FiveMenOneRingList_Query_HICM");
+
+ // 閬嶅巻鎵�鏈夎〃
+ 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
}
}
--
Gitblit v1.9.1