From 1391244d57b3f6fac3d7881268b8033b53cc03fe Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期二, 02 十一月 2021 17:34:09 +0800 Subject: [PATCH] 器具管理模块加审核反审核权限 --- WebAPI/Controllers/WebAPIController.cs | 581 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 550 insertions(+), 31 deletions(-) diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index d0d38ed..e783b85 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -1,6 +1,8 @@ 锘縰sing DAL; using DBUtility; using Model; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using SQLHelper; using System; @@ -23,7 +25,8 @@ public DataSet ds = new DataSet(); private json objjson = new json(); private json objJsonResult = new json(); - // private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices(); + //public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"; + // private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices(); /// <summary> /// 閫佽揣鍗曡〃澶翠俊鎭� /// </summary> @@ -370,7 +373,7 @@ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); if (Warehouse != "") { - sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' ) "; + sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' or HUSEORGID like '%" + Warehouse + "%' ) "; } try { @@ -712,14 +715,8 @@ /// <returns></returns> [Route("Web/GetMaterialList_Json")] [HttpGet] - public object GetMaterialList_Json(string Material) + public object GetMaterialList_Json(string sWhere) { - sWhere = " Where HStopFlag=0 and HEndFlag=1"; - //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); - if (Material != "") - { - sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) "; - } try { ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo); @@ -1016,10 +1013,10 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //鑾峰彇鏈�澶D鍊艰祴鍊� DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_BadReason ", "Gy_BadReason"); - if (Maxds!=null||Maxds.Tables[0].Rows.Count > 0) + if (Maxds != null || Maxds.Tables[0].Rows.Count > 0) { //HItemID= Maxds.Tables[0].Rows[0]["HItemID"] - var maxid=Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]); + var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]); maxid += 1; HItemID = maxid; } @@ -1049,7 +1046,7 @@ objJsonResult.data = 1; return objJsonResult; } - if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()) ) + if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim())) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -1058,9 +1055,9 @@ return objJsonResult; } //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮� - - ds = oCN.RunProcReturn("select * from Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim()+"'", "Gy_BadReason"); - if ( oItem.HNumber.Trim()=="" ) + + ds = oCN.RunProcReturn("select * from Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadReason"); + if (oItem.HNumber.Trim() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -1069,7 +1066,7 @@ return objJsonResult; } //鏂板鏃跺垽鏂� - if (oItem.HItemID==0) + if (oItem.HItemID == 0) { if (ds == null || ds.Tables[0].Rows.Count == 0) { @@ -1144,11 +1141,11 @@ } oItem.HShortNumber = sShortNumber;//鐭唬鐮� oItem.HEndFlag = true;//鏈骇鏍囧織 - oItem.HLevel= DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇 + oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇 oBill.oModel = oItem; } - + //淇濆瓨 //淇濆瓨瀹屾瘯鍚庡鐞� bool bResult; @@ -1234,7 +1231,7 @@ } oCN.BeginTran();//寮�濮嬩簨鍔� ds = oCN.RunProcReturn("select * from Gy_BadReason where HItemID=" + HItemID, "Gy_BadReason"); - if (ds == null || ds.Tables[0].Rows.Count == 0 ) + if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -1242,22 +1239,22 @@ objJsonResult.data = null; return objJsonResult; ; } - var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]); - if (HStopflag) - { - oCN.RollBack();//鍥炴粴浜嬪姟 - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒"; - objJsonResult.data = null; - return objJsonResult; - } + //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]); + //if (HStopflag) + //{ + // oCN.RollBack();//鍥炴粴浜嬪姟 + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} - oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID); + oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID); oCN.Commit();//鎻愪氦浜嬪姟 objJsonResult.code = "0"; objJsonResult.count = 1; - objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�"; + objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�"; objJsonResult.data = null; return objJsonResult; ; @@ -1726,6 +1723,528 @@ } } + /// <summary> + /// 鑾峰彇鐐规椤圭洰鍒楄〃 + /// </summary> + /// <returns></returns> + [Route("Web/GetCheckItemList_Json")] + [HttpGet] + public object GetCheckItemList_Json(string CheckItem) + { + DataSet ds; + try + { + sWhere = " Where HStopFlag=0 and HEndFlag=1"; + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); + if (CheckItem != ""&& CheckItem!=null) + { + sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) "; + ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck"); + } + else + { + ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck"); + } + 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 = "0"; + 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> + [Route("Web/GetSc_ICMOBillListView")] + [HttpGet] + public object GetSc_ICMOBillListView(string ICMOBill,int OrganizationID) + { + if (ICMOBill != "") + { + sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')='' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_IF_ICMOBillList"); + } + else + { + string sql = "select * from h_v_IF_ICMOBillList "+ sWhere+ " and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')='' order by 鍗曟嵁鍙� desc,hsubid "; + ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList"); + } + 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 = "0"; + 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> + [Route("Web/GetSc_ICMOBillListView2")] + [HttpGet] + public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID) + { + if (ICMOBill != "") + { + sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList"); + } + else + { + string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid "; + ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList"); + } + 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 = "0"; + 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> + [Route("Web/GetSc_ProcessExchangeBillListView")] + [HttpGet] + public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID) + { + if (ICMOBill != "") + { + sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ProcessExchangeBillList"); + } + else + { + string sql = "select * from h_v_Sc_ProcessExchangeBillList " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid "; + ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList"); + } + 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 = "0"; + 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> + [Route("Web/GetGy_QCCheckItem")] + [HttpGet] + public object GetGy_QCCheckItem(string CheckItem,int OrganizationID) + { + if (CheckItem != "") + { + sWhere = " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("Select HItemID,HNumber 浠g爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒� from Gy_QCCheckItem where HStopflag=0 Order by HItemID ", "Gy_QCCheckItem"); + } + else + { + string sql = "Select HItemID,HNumber 浠g爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒� from Gy_QCCheckItem where HStopflag=0 " + sWhere + "Order by HItemID "; + ds = oCN.RunProcReturn(sql, "Gy_QCCheckItem"); + } + 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 = "0"; + 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> + [Route("Web/GetGy_QCCheckProject")] + [HttpGet] + public object GetGy_QCCheckProject(string CheckProject, int OrganizationID) + { + if (CheckProject != "") + { + sWhere = " and ( HBillNo like '%" + CheckProject + "%' or HName like '%" + CheckProject + "%' ) "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + string sql = "Select HinterID HItemID,HBillNo 妫�楠屾柟妗堜唬鐮�,HName 鏂规鍚嶇О from Gy_QCCheckProjectMain where 1 = 1 " + sWhere + "Order by HinterID "; + ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain"); + 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> + [Route("Web/GetCheckItemByCheckProjectID")] + [HttpGet] + public object GetCheckItemByCheckProjectID(int CheckProjectID) + { + if (CheckProjectID <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "妫�楠屾柟妗堟湭閫夋嫨"; + objjson.data = null; + return objjson; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + string sql = "select c.HItemID HQCCheckItemID,c.HName 妫�楠岄」鐩�,b.HQCStd,b.HQCUnit HUnit from Gy_QCCheckProjectMain a left join Gy_QCCheckProjectSub b on a.HInterID = b.HInterID left join Gy_QCCheckItem c on b.HQCCheckItemID = c.HItemID where a.HInterID = " + CheckProjectID; + ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain"); + 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> + [Route("Web/GetRepairList_Json")] + [HttpGet] + public object GetRepairList_Json(string Repair) + { + if (Repair != "") + { + sWhere = " and ( HNumber like '%" + Repair + "%' or HName like '%" + Repair + "%' ) "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_Repair where HStopflag=0 Order by HItemID ", "Gy_Repair"); + } + else + { + string sql1 = "Select HItemID,HNumber ,HName from Gy_Repair where HStopflag=0 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "Gy_Repair"); + } + 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 = "0"; + 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> + [Route("Web/GetWMSBarCodeDetailsList")] + [HttpGet] + public object GetWMSBarCodeDetailsList(int HInterID,string HBillType) + { + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + ds = oCN.RunProcReturn("Select * from h_v_KF_PonderationBillMain_Temp_Sum where HInterID=" + HInterID + " and HBillType='" + HBillType + "' Order by HItemID ", "h_v_KF_PonderationBillMain_Temp_Sum"); + //ds = oCN.RunProcReturn("Select top 10 * from h_v_KF_PonderationBillMain_Temp_Sum Order by HInterID ", "h_v_KF_PonderationBillMain_Temp_Sum"); + 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 = "0"; + 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> + /// 鏍规嵁ID鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍 + /// </summary> + /// <param name="sHitemID">缂撳瓨琛↖D</param> + /// <returns>object</returns> + [Route("Web/DelCacheList")] + [HttpGet] + public object DelCacheList(long sHitemID) + { + try + { + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HitemID = " + sHitemID); + 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; + } + } + + + #region [鏌ヨ鑿滃崟鍒楄〃] + [Route("Web/MenuList")] + [HttpGet] + public object MenuList() + { + try + { + List<Menu> mu = new List<Menu>(); + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + ds = oCn.RunProcReturn("Select * from Gy_Menu 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); + //string json = JsonConvert.SerializeObject(dd); + for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈� + { + if (ds.Tables[0].Rows[i]["HPartentID"].ToString()=="0" || ds.Tables[0].Rows[i]["HitemID"].ToString() == ds.Tables[0].Rows[i]["HPartentID"].ToString()) //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐� + { + Menu tbj = new Menu(); + tbj.HitemID = ds.Tables[0].Rows[i]["HitemID"].ToString(); + tbj.HNumber = ds.Tables[0].Rows[i]["HNumber"].ToString(); + tbj.HName = ds.Tables[0].Rows[i]["HName"].ToString(); + 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(); + mu.Add(tbj); + } + } + ToHierarchy.digui(ds.Tables[0], mu); + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data =Newtonsoft.Json.JsonConvert.SerializeObject(mu); + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触锛�"; + objJsonResult.data = e.ToString(); + return objJsonResult; + } + } + #endregion } -- Gitblit v1.9.1