From 7f44db5392fbf212237f59b1b9a3db9f1707803c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 20 六月 2023 09:46:33 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 028a6d9..905fee0 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -26,6 +26,7 @@
private json objjson = new json();
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
//public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
// private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
/// <summary>
@@ -201,7 +202,7 @@
public object GetUser(string UserName, string PassWord, string HOrgName)
{
try
- {
+ {
DataSet ds = null;
ClsCN oCnLoc = new ClsCN();
DAL.ClsUser oUser = new DAL.ClsUser();
@@ -239,6 +240,49 @@
objjson.code = "0";
objjson.count = 0;
objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
+ objjson.data = null;
+ return objjson; ;
+ }
+ }
+ /// <summary>
+ /// 鑿滃崟鏍�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/MenuBar")]
+ [HttpGet]
+ public object MenuBar(string UserName)
+ {
+ try
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Xt_MenuBar_Unfold", 1, false, UserName))
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鏃犲睍寮�鑿滃崟鏍忔潈闄�!";
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ }
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "灞曞紑鎴愬姛锛�";
+ objjson.data = 1;
+ return objjson;
+ }
+ catch (Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "寮傚父锛�" + e.Message;
objjson.data = null;
return objjson; ;
}
@@ -3875,7 +3919,7 @@
{
List<Menu> mu = new List<Menu>();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- ds = oCn.RunProcReturn("Select * from Gy_Menu Order by HItemID ", "Gy_Menu");
+ ds = oCn.RunProcReturn("Select * from Gy_Menu_1 Order by HItemID ", "Gy_Menu");
//List<Menu> mu1 = ds.Tables[0].AsEnumerable().Select(t => new Menu()).ToList();
//List<Menu> users = ModelConvertHelper<Menu>.ConvertToModel(ds.Tables[0]);
//var dd = ToHierarchy.ToHierarchyList(users);
--
Gitblit v1.9.1