From debfb742b27f7a5e668e6cd3f52db2ee8ddfe815 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 13 四月 2026 10:08:35 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 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 8342b19..3e43e2c 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"
@@ -490,13 +490,19 @@
         /// </summary>
         [Route("QC_Report/QualityTraceability5")]
         [HttpGet]
-        public object QualityTraceability5(string HICMOBillNo, string HType)
+        public object QualityTraceability5(string sWhere, string HType)
         {
             try
             {
                 List<object> columnNameList = new List<object>();
 
-                ds = oCN.RunProcReturn("exec h_p_Sc_QueryQualityByICMOBill '" + HType + "','" + HICMOBillNo + "'", "h_p_Sc_QueryQualityByICMOBill");
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+                string HICMOInterID = dic["HICMOInterID"].ToString();
+                string HICMOEntryID = dic["HICMOEntryID"].ToString();
+                string HICMOBillNo = dic["HICMOBillNo"].ToString();
+
+                ds = oCN.RunProcReturn("exec h_p_Sc_QueryQualityByICMOBill '" + HType + "','" + HICMOBillNo + "','" + HICMOInterID + "','" + HICMOEntryID + "'", "h_p_Sc_QueryQualityByICMOBill");
 
 
                 //娣诲姞鍒楀悕
@@ -2401,5 +2407,51 @@
         }
 
         #endregion
+
+        #region 璐ㄩ噺妯″潡 閲忓叿涓存湡璇彞鎶ヨ〃
+        [Route("QC_CustomerAppealReport/GetQC_MeasuringToolsReport")]
+        [HttpGet]
+        public object GetQC_MeasuringToolsReport(string sWhere, string user,int HOrgID)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+              
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+                string HNumber = dic["HNumber"].ToString();
+                string HName = dic["HName"].ToString();
+                string HDayWarning = dic["HDayWarning"].ToString();
+                string HMouldClass = dic["HMouldClass"].ToString();
+
+
+                ds = oCN.RunProcReturn("exec h_p_Gy_InspectWarningReport '" + HNumber + "','" + HName + "','" + HDayWarning + "','" + HMouldClass + "','" + HOrgID + "'", "h_p_Gy_InspectWarningReport");
+
+                //娣诲姞鍒楀悕
+                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