From 56e69237fcfd7d7841c60981728f0190ae48ef32 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 24 九月 2025 17:00:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 99af3bd..3df6d9d 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"
@@ -293,13 +293,19 @@
/// </summary>
[Route("QC_Report/QualityTraceability1")]
[HttpGet]
- public object QualityTraceability1(string HICMOBillNo, string HType)
+ public object QualityTraceability1(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");
//娣诲姞鍒楀悕
@@ -336,13 +342,20 @@
/// </summary>
[Route("QC_Report/QualityTraceability2")]
[HttpGet]
- public object QualityTraceability2(string HICMOBillNo, string HType)
+ public object QualityTraceability2(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");
+
//娣诲姞鍒楀悕
@@ -379,13 +392,18 @@
/// </summary>
[Route("QC_Report/QualityTraceability3")]
[HttpGet]
- public object QualityTraceability3(string HICMOBillNo, string HType)
+ public object QualityTraceability3(string sWhere, string HType)
{
try
{
List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
- ds = oCN.RunProcReturn("exec h_p_Sc_QueryQualityByICMOBill '" + HType + "','" + HICMOBillNo + "'", "h_p_Sc_QueryQualityByICMOBill");
+ 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");
//娣诲姞鍒楀悕
@@ -422,13 +440,20 @@
/// </summary>
[Route("QC_Report/QualityTraceability4")]
[HttpGet]
- public object QualityTraceability4(string HICMOBillNo, string HType)
+ public object QualityTraceability4(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");
+
//娣诲姞鍒楀悕
@@ -465,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");
//娣诲姞鍒楀悕
--
Gitblit v1.9.1