From efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 29 六月 2023 14:55:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 182 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 182 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index eda26a4..7ac5333 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -4154,6 +4154,188 @@
+ #region 鐢ㄦ埛鑿滃崟蹇嵎鏂瑰紡鑷畾涔�
+
+ #region 鑾峰彇鐢ㄦ埛蹇嵎鏂瑰紡閫夋嫨鑿滃崟
+
+ //蹇嵎鏂瑰紡鑷畾涔夎彍鍗曪細鑾峰彇鏍戠粍浠舵暟鎹�
+ [Route("Web/Xt_UserFastMenu_Display")]
+ [HttpGet]
+ public object Xt_UserFastMenu_Display(string HMakeName)
+ {
+ try
+ {
+ //鑾峰彇鏋勫缓鏍戠姸缁撴瀯鐨勬暟鎹�
+ List<MenuInit> menuInitList = new List<MenuInit>(); //鐢ㄤ互鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝浠ュ強瀵瑰簲鑺傜偣鏄惁琚�変腑闇�瑕佸姞杞芥樉绀�
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ ds = oCn.RunProcReturn("Select * from Gy_Menu_1 Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏呭疄鏁版嵁
+
+ DataSet ds1 = new DataSet();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //灏咷y_Menu_1涓殑鑿滃崟淇℃伅鍙婇�変腑鎯呭喌淇濆瓨鍒癿enuInitList鍒楄〃涓紝
+ {
+ //濉厖鍩烘湰鏁版嵁
+ MenuInit menuInit = new MenuInit();
+ menuInit.HitemID = ds.Tables[0].Rows[i]["HItemID"].ToString();
+ menuInit.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString();
+ menuInit.HNumber = ds.Tables[0].Rows[i]["HNumber"].ToString();
+ menuInit.HName = ds.Tables[0].Rows[i]["HName"].ToString();
+ menuInit.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
+ menuInit.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
+ menuInit.HType = ds.Tables[0].Rows[i]["HType"].ToString();
+ menuInit.HSelected = false;
+
+ //鍒ゆ柇鐢ㄦ埛鏄惁閫変腑鏄剧ず璇ヨ彍鍗�
+ String sql = "Select * from Xt_UserFastMenu where HSubFuncID = '" + ds.Tables[0].Rows[i]["HItemID"] + "' and HUserID='" + HMakeName + "'";
+ ds1 = oCn.RunProcReturn(sql, "Xt_UserFastMenu");
+ if (ds1.Tables[0].Rows.Count > 0) //瀵逛簬Gy_Menu_1琛ㄤ腑鐨勮彍鍗曡妭鐐癸紝閫氳繃妫�绱㈠湪Gy_MenuDefineSet琛ㄤ腑瀵瑰簲鐢ㄦ埛鏄惁瀛樺湪璇ヨ妭鐐圭殑淇℃伅锛屽垽鏂鐢ㄦ埛鏄惁閫変腑璇ヨ妭鐐归渶瑕佸姞杞芥樉绀哄湪渚ц彍鍗曟爮
+ {
+ menuInit.HSelected = true;
+ }
+ menuInitList.Add(menuInit); //灏咷y_Menu_1琛ㄤ腑鐨勮彍鍗曡妭鐐逛俊鎭�愪竴娣诲姞鍒癿enuInitList鍒楄〃涓�
+ }
+
+
+ //瀛樺偍鏍戠姸缁撴瀯鐨勬暟鎹�
+ List<MenuDefineList> tree = new List<MenuDefineList>(); //鐢ㄤ互鑾峰彇鑿滃崟娓呭崟鍦╨ayui涓爲缁勪欢娓叉煋鍙傛暟option涓璬ata鍊煎�肩殑鍙傛暟
+ for (int i = 0; i < menuInitList.Count; i++) //鑾峰彇鑿滃崟娓呭崟涓殑鏍硅妭鐐圭殑娓叉煋鏁版嵁
+ {
+ if (menuInitList[i].HPartentID == "0" || menuInitList[i].HitemID == menuInitList[i].HPartentID) //鍒ゆ柇鏄惁鏄牴鑺傜偣
+ {
+ MenuDefineList define = new MenuDefineList();
+ define.id = menuInitList[i].HitemID;
+ define.field = menuInitList[i].HitemID;
+ define.title = menuInitList[i].HName;
+ define.spread = false;
+ define.selected = false;
+ if (menuInitList[i].HSelected == true)
+ {
+ define.selected = true;
+ }
+ tree.Add(define);
+ }
+ }
+
+ MenuDefineResult res = new MenuDefineResult();
+ res.dt = menuInitList;
+ res.tree = tree;
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = res;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 淇濆瓨鐢ㄦ埛蹇嵎鏂瑰紡閫夋嫨鑿滃崟
+
+ //淇濆瓨鐢ㄦ埛蹇嵎鏂瑰紡閫夋嫨鑿滃崟
+ [Route("Web/Xt_UserFastMenu_Save")]
+ [HttpPost]
+ public object Xt_UserFastMenu_Save([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ //鑾峰彇浼犲弬鐨勮嚜瀹氫箟鏁版嵁
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg = _value.ToString();
+ string[] sArray = msg.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string HMakeName = sArray[1].ToString();
+ string saveData = sArray[0].ToString();
+ List<SaveDefineMenu> saveDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SaveDefineMenu>>(saveData);
+
+ //澹版槑鏁版嵁搴撴搷浣滃伐鍏�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ //璁剧疆鏁版嵁搴撴搷浣滅殑鍥炴粴鐐癸紝鑻ュ湪鎻愪氦鍓嶆姤閿欙紝鍒欏洖婊氬埌璇ョ偣锛屾湡闂存搷浣滃彇娑�
+ oCN.BeginTran();
+
+ //鍒犻櫎褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鏁版嵁
+ string sql = "delete from Xt_UserFastMenu where HUserID = '" + HMakeName + "'";
+ oCN.RunProc(sql);
+
+ //鎻掑叆褰撳墠鐢ㄦ埛鏈�鏂扮殑鑷畾涔夋暟鎹�
+ for (int i = 0; i < saveDataList.Count; i++)
+ {
+ sql = "select * from Gy_Menu_1 where HPartentID = '" + saveDataList[i].HItemID + "'";
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
+ if (ds.Tables[0].Rows.Count == 0) //鍒ゆ柇璇ヨ妭鐐规槸鍚︿负鏈�涓嬬骇鑺傜偣锛屽嵆涓嶅瓨鍦ㄥ瓙鑺傜偣
+ {
+ sql = "select * from Gy_Menu_1 where HItemID = '" + saveDataList[i].HItemID + "'";
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ string HUserID = HMakeName;
+ string HSubFuncID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ string HCaption = ds.Tables[0].Rows[0]["HName"].ToString();
+
+ sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "')";
+ oCN.RunProc(sql);
+ }
+ }
+ }
+ //鎻愪氦鏁版嵁搴撴搷浣�
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍔犺浇console.html椤甸潰鐨勫揩鎹锋柟寮�
+ //蹇嵎鏂瑰紡鑷畾涔夎彍鍗曪細鑾峰彇鏍戠粍浠舵暟鎹�
+ [Route("Web/Xt_UserFastMenu_Init")]
+ [HttpGet]
+ public object Xt_UserFastMenu_Init(string HMakeName)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ 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 + "' Order by a.HItemID";
+ ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
--
Gitblit v1.9.1