From 98fdb31018bde24c16598b98cdd1cf526dc1113f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 31 十二月 2024 10:37:01 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 201 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 180 insertions(+), 21 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 89ab01a..f0eb048 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"
@@ -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));//鑾峰彇鍒癉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)
{
@@ -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));//鑾峰彇鍒癉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
}
}
--
Gitblit v1.9.1