From 52fdbb3d0c065abc0bba434188c98affed024e76 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 30 八月 2024 15:16:40 +0800
Subject: [PATCH] 各工序趋势图后端查询

---
 WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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..eec3a8e 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"
@@ -640,17 +640,17 @@
         {
             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();
+                
+                ds = oCN.RunProcReturn("exec h_p_Sc_StationOutBillQuery_HProc '" + HYear + "','" + HMonth + "','" + HDivisionName + "','" + HProcName + "','" + HMaterName + "'", "h_p_SB_EquipICMOTechParamBillList");
+
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)

--
Gitblit v1.9.1