From aa51348d3501aa3a9bbda287929f3c8a05825063 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 03 十二月 2025 18:14:31 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
index 1e1093e..1bb3e17 100644
--- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
+++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -86,13 +86,17 @@
#region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ
[Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")]
[HttpGet]
- public object OrderProcFlowAllReportList(string sWhere)
+ public object OrderProcFlowAllReportList(string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
{
try
{
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ if (sWhere != null)
+ {
+ sWhere = sWhere.Replace("'", "''");
+ }
- ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport " +sWhere+"", "h_p_Mes_OrderProcFlowAllReport");
+ ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport '" + txtHOrderProcNo +"','"+ txtHMaterNumber +"','"+ check +"','"+ txtHDeptName + "','"+sWhere+"'", "h_p_Mes_OrderProcFlowAllReport");
List<object> listCol = new List<object>();
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -123,13 +127,19 @@
#region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ
[Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
[HttpGet]
- public object OrderProcFlowAllReportList_TK(string sWhere)
+ public object OrderProcFlowAllReportList_TK(DateTime HDate1,DateTime HDate2, string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
{
try
{
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ if (sWhere != null)
+ {
+ sWhere = sWhere.Replace("'", "''");
+ }
- ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");
+ ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK '" + HDate1 +"','"+ HDate2+"','"+ txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "','" + txtHDeptName + "','" + sWhere + "'", "h_p_Mes_OrderProcFlowAllReport");
+
+ // ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");
List<object> listCol = new List<object>();
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1