From d19fcd70a3b11339eb0c50b5c734eeca855a9a95 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 二月 2025 14:05:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/QC_ManagementController.cs | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 72a832c..d24128a 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -9,6 +9,7 @@
using System.Data;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using Newtonsoft.Json;
namespace WebAPI.Controllers
{
@@ -33,12 +34,21 @@
{
try
{
+ List<object> a = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = a;
return objJsonResult;
//}
//else
@@ -101,6 +111,53 @@
#endregion
#region 鏌ヨ鍒楄〃鏂规硶
+
+ /// <summary>
+ /// 杩斿洖妫�楠屾柟妗堝崟鍒楄〃 浠呭寘鍚富琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("QC_Management/MES_QC_CheckProjectList_Json_Main")]
+ [HttpGet]
+ public object MES_QC_CheckProjectList_Json_Main(string sWhere, string user)
+ {
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+
/// <summary>
/// 杩斿洖妫�楠屾柟妗堝崟鍒楄〃
/// </summary>
@@ -256,7 +313,7 @@
else
{
string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where 鍏抽棴浜�='' ";
- string sql = sql1 + sqlWhere+ " order by hmainid desc ";
+ string sql = sql1 + sqlWhere+ " order by 鍒跺崟鏃ユ湡 desc ";
ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
}
}
@@ -947,6 +1004,33 @@
}
#endregion
+ #region 妫�楠屾柟妗堟煡璇�
+ [Route("QC_Management/MES_QC_CheckProjectListProjectDetaiList")]
+ [HttpGet]
+ public object MES_QC_CheckProjectListProjectDetaiList(string sWhere,string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn(string.Format(@"select * from h_v_Gy_QCCheckProjectList_Edit where 1=1 " + sWhere), "h_v_Gy_QCCheckProjectList_Edit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region 妫�楠屾柟妗堢紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁
[Route("QC_Management/MES_QC_CheckProjectListProjectDetai")]
[HttpGet]
--
Gitblit v1.9.1