From 45f136e3464ba7a6b3801200db873792b7dc099c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 10 一月 2025 11:18:09 +0800
Subject: [PATCH] 菜单自定义：根据数据表中的HOpenType字段，设置页面打开方式为主控台框架内打开还是打开新页面
---
WebAPI/Controllers/WebAPIController.cs | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 104 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 744423fb..bec0e3a 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -388,6 +388,51 @@
}
}
/// <summary>
+ /// 鐧诲綍鏍规嵁ic鍗¤幏鍙栦俊鎭�
+ /// </summary>
+ /// <param name="HBarCode"></param>
+ /// <returns></returns>
+ [Route("Web/GetUserByICCard")]
+ [HttpGet]
+ public object GetUserByICCard(string HBarCode)
+ {
+ try
+ {
+ DataSet ds = null;
+ ClsCN oCnLoc = new ClsCN();
+ DAL.ClsUser oUser = new DAL.ClsUser();
+ string sql = string.Format(@" select a.* from h_v_Gy_Czygl_Login a
+ where a.HICNumber = '{0}'", HBarCode);
+ ds = oCnLoc.RunProcReturn(sql, "h_v_Gy_Czygl_Login");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鏃犳ic鍗″搴斿憳宸ヤ俊鎭紒";
+ objjson.data = null;
+ return objjson;
+ }
+
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "淇℃伅鑾峰彇鎴愬姛锛�";
+ objjson.data = ds.Tables[0];
+ return objjson;
+
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
+ objjson.data = null;
+ return objjson; ;
+ }
+ }
+
+ /// <summary>
/// 鑿滃崟鏍�
/// </summary>
/// <returns></returns>
@@ -15079,6 +15124,46 @@
}
/// <summary>
+ /// 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇妫�楠屾柟妗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetCheckItemID")]
+ [HttpGet]
+ public object GetCheckItemID(string HName,string HProName)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
/// 鏍规嵁妫�楠屾柟妗堜富鍐呯爜鑾峰彇妫�楠岄」鐩�
/// </summary>
/// <returns></returns>
@@ -16184,6 +16269,7 @@
public int HLevel { get; set; }
public string Hurl { get; set; }
public string HPicNum { get; set; }
+ public string HOpenType { get; set; }
public List<MenuLoad> childMenus { get; set; }
}
@@ -16195,12 +16281,19 @@
{
List<MenuLoad> mu = new List<MenuLoad>(); //浠ョ埗瀛愮骇缁撴瀯瀛樻斁鑿滃崟娓呭崟淇℃伅
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //鏁版嵁搴撴搷浣滃伐鍏�
- string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
+ string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HOpenType from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁
if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
{
- sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
- ds = oCn.RunProcReturn(sql, "Gy_Menu");
+ string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HOpenType from Gy_MenuDefineSet where HMakeName=" +
+ "(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
+ "left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))";
+ ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓�
+ if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
+ {
+ sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
+ ds = oCn.RunProcReturn(sql, "Gy_Menu");
+ }
}
for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //灏嗚彍鍗曠殑鏍硅妭鐐逛繚瀛樺埌鍒楄〃menu涓�
@@ -16214,6 +16307,7 @@
tbj.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString();
tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
+ tbj.HOpenType = ds.Tables[0].Rows[i]["HOpenType"].ToString();
if (ds.Tables[0].Rows[i]["HPicNum"] != null)
{
tbj.HPicNum = ds.Tables[0].Rows[i]["HPicNum"].ToString();
@@ -16256,6 +16350,7 @@
tbjson.HName = dt.Rows[i]["HName"].ToString();
tbjson.HLevel = tree[m].HLevel;
tbjson.Hurl = dt.Rows[i]["Hurl"].ToString();
+ tbjson.HOpenType = dt.Rows[i]["HOpenType"].ToString();
if (dt.Rows[i]["HPicNum"] != null)
{
tbjson.HPicNum = dt.Rows[i]["HPicNum"].ToString();
@@ -16644,6 +16739,12 @@
string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
+ ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
--
Gitblit v1.9.1