From 44022bb67f0274c444dce7bc558e7a16df93b402 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 17:43:07 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 212 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 172 insertions(+), 40 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 bf33427..41b7e8a 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"
@@ -678,7 +678,7 @@
}
#endregion
- #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�
+ #region 璐ㄩ噺妯″潡 璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�+妯″叿
[Route("QC_CustomerAppealReport/Get_EquipList")]
[HttpGet]
@@ -688,7 +688,10 @@
{
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HName HName from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain b on a.HEquipID=b.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
+ 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");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -949,16 +952,19 @@
try
{
List<object> columnNameList = new List<object>();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformanceFirstPassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformanceFirstPassList");
- }
- else
- {
- string sql1 = "select * from h_v_QC_ProcessPerformanceFirstPassList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鏈堜唤 ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformanceFirstPassList");
- }
+
+ 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");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -986,7 +992,6 @@
}
#endregion
-
#region 璐ㄩ噺妯″潡 鍒剁▼缁╂晥瓒嬪娍鍥�(鍚堟牸鐜�) 鏌ヨ
[Route("QC_CustomerAppealReport/getQC_ProcessPerformancePass")]
@@ -996,16 +1001,19 @@
try
{
List<object> columnNameList = new List<object>();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformancePassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformancePassList");
- }
- else
- {
- string sql1 = "select * from h_v_QC_ProcessPerformancePassList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鏈堜唤 ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformancePassList");
- }
+
+ 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");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1381,25 +1389,16 @@
{
List<object> columnNameList = new List<object>();
- Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
-
- string HEquipNumber = dic["HEquipNumber"].ToString();
- string HEquipName = dic["HEquipName"].ToString();
- string HProcName = dic["HProcName"].ToString();
-
- string HTechParamName = dic["HTechParamName"].ToString();
- string HDate = dic["HDate"].ToString();
-
- if ((HEquipNumber == null || HEquipNumber == "") && (HEquipName == null || HEquipName == "") && (HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HDate == null || HDate == ""))
+ if (sWhere == null || sWhere.Equals(""))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
- objJsonResult.data = null;
- return objJsonResult;
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam order by 閲囬泦鏃ユ湡 desc", "h_v_Sb_EquipMentCollectionTechParam");
}
-
- ds = oCN.RunProcReturn("select HSourceCode 璁惧缂栫爜,CONVERT(VARCHAR, HDate, 120) 閲囬泦鏃ユ湡,HTechParamName 宸ヨ壓浜ф暟,HResult 鏁伴噰鍊� from Sb_EquipMentCollectionTechParam_Temp where HSourceCode='" + HEquipNumber + "' and HTechParamName='"+ HTechParamName + "' and CONVERT(date, HDate) <='"+HDate+"'", "Sb_EquipMentCollectionTechParam_Temp");
+ 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");
+ }
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1427,5 +1426,138 @@
}
#endregion
+ #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
+ /// <summary>
+ /// 杩斿洖寮傚父闂鏉ユ簮
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
+ [HttpGet]
+ public object Get_QC_FiveMenOneRingList(string SN, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList '" + SN + "'", "h_p_QC_FiveMenOneRingList");
+
+ // 閬嶅巻鎵�鏈夎〃
+ 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 璐ㄩ噺妯″潡 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
+
+ /// <summary>
+ /// 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json")]
+ [HttpGet]
+ public object GetQC_SkillExamMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_SkillExamMonthSumReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 璐ㄩ噺妯″潡 PPM缁╂晥瓒嬪娍鍥炬姤琛�
+
+ /// <summary>
+ /// PPM缁╂晥瓒嬪娍鍥炬姤琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
+ [HttpGet]
+ public object GetQC_PPMReport_Json(Int64 HYear, Int64 HDeptID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_PPMReport");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
}
}
--
Gitblit v1.9.1