From ea43c7b135fb7e38278737c43b58063a9d02a2ab Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 20 八月 2025 08:50:41 +0800
Subject: [PATCH] 不良top3问题报表添加部门查询维度，部门以下拉框的形式加载出来，放在月份过滤字段旁边。生产质量汇报单表头上有部门信息
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 3 ++-
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f8cb64e..02baea2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -317,6 +317,33 @@
}
#endregion
+ #region 鑾峰彇杞﹂棿鍙�
+ [Route("Gy_Material/Get_HDepartment")]
+ [HttpGet]
+ public object Get_HDepartment()
+ {
+ try
+ {
+ DataSet oDs = new DataSet();
+ //==========
+ oDs = oCN.RunProcReturn("select top(20) HItemID , HName from Gy_Department", "Gy_Department");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult; ;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
/// <summary>
/// 鑾峰彇椤圭洰鍒楄〃
/// </summary>
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 706c4a6..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"
@@ -2074,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)
--
Gitblit v1.9.1