From 99bcfefdb20187000fc89a8f2654745ad2f0e371 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 12 五月 2026 15:39:09 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
index 2d997d5..fc14a83 100644
--- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
+++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -9,6 +9,7 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
+using WebAPI.Utility;
namespace WebAPI.Controllers.CJGL
{
@@ -86,13 +87,60 @@
#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)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ
+ [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
+ [HttpGet]
+ 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 '" + 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)
@@ -603,6 +651,7 @@
/// <returns></returns>
[Route("Mes_OrderProcFlowAllReportController/GetSc_ProcessErrStationReport_Json")]
[HttpGet]
+ [Permission(HModName = "Sc_ProcessErrStationReport")]
public object GetSc_ProcessErrStationReport_Json(string sWhere,string user)
{
try
--
Gitblit v1.9.1