MES-WEB-API.git

			@@ -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; ;
			}
			@@ -296,6 +340,122 @@
			return objjson; ;
			}
			}


			#region 用户设置
			#region 获取用户信息
			[Route("Gy_USERSet_PDA/GetGy_Czygl_Info")]
			[HttpGet]
			public object GetGy_Czygl_Info(string Czybm, string user)
			{
			try
			{
			//查看权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无查看权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = @"select Czybm, Czymc, HWhID, HWhName, HSecManagerID, HSecManager, HKeeperID, HKeeper, HDeptID, HDept, HCloudUserName, HCloudUserPsd from Gy_Czygl where Czybm = '" + Czybm + "'";
			ds = oCN.RunProcReturn(sql, "Gy_Czygl");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未找到相关数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 保存用户信息
			[Route("Gy_USERSet_PDA/SaveGy_Czygl_Info")]
			[HttpPost]
			public object SaveGy_Czygl_Info([FromBody] JObject sMainSub)
			{
			try
			{
			//获取参数
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);

			Int64 HWhID = Int64.Parse(sArray[0].ToString());
			string HWhName = sArray[1].ToString();
			Int64 HSecManagerID = Int64.Parse(sArray[2].ToString());
			string HSecManager = sArray[3].ToString();
			Int64 HKeeperID = Int64.Parse(sArray[4].ToString());
			string HKeeper = sArray[5].ToString();
			Int64 HDeptID = Int64.Parse(sArray[6].ToString());
			string HDept = sArray[7].ToString();
			string HCloudUserName = sArray[8].ToString().Trim();
			string HCloudUserPsd = sArray[9].ToString().Trim();

			string Czybm = sArray[10].ToString();
			string user = sArray[11].ToString(); //操作用户的用户名

			////判断是否有新增权限
			//if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBillQualityStatus_Tmp_Edit", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无新增权限!";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = "update Gy_Czygl set " +
			"HWhID = " + HWhID +
			", HWhName = '" + HWhName +
			"', HSecManagerID = " + HSecManagerID +
			", HSecManager = '" + HSecManager +
			"', HKeeperID = " + HKeeperID +
			", HKeeper = '" + HKeeper +
			"', HDeptID = " + HDeptID +
			", HDept = '" + HDept +
			"', HCloudUserName = '" + HCloudUserName +
			"', HCloudUserPsd = '" + HCloudUserPsd +
			"' where Czybm = '" + Czybm + "'";

			oCN.RunProc(sql);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion



			@@ -1648,7 +1808,7 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("Select p.HItemID,p.HNumber 工序代码,p.HName 工序,w.HItemID 工作中心ID,w.HNumber 工作中心代码,w.HName 工作中心,d.HItemID 部门ID,d.HNumber 部门代码,d.HName 部门 from Gy_Process p left join Gy_WorkCenter w on p.HWorkCenterID = w.HItemID left join Gy_Department d on p.HDeptID = d.HItemID where p.HStopflag = 0 " + sWhere + " Order by HItemID ", "Gy_Process");
			ds = oCN.RunProcReturn("Select p.HItemID,p.HNumber 工序代码,p.HName 工序,w.HItemID 工作中心ID,w.HNumber 工作中心代码,w.HName 工作中心,d.HItemID 部门ID,d.HNumber 部门代码,d.HName 部门 from Gy_Process p left join Gy_WorkCenter w on p.HWorkCenterID = w.HItemID left join Gy_Department d on p.HDeptID = d.HItemID where p.HStopflag = 0 " + sWhere + " Order by p.HNumber ", "Gy_Process");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -2619,7 +2779,7 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select a.HItemID ,HNumber 核算方式组代码,HName 核算方式组名称,HDeptID,b.部门名称部门 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
			string sql = "Select a.HItemID ,HNumber 核算方式组代码,HName 核算方式组名称,HDeptID,b.部门代码,b.部门名称部门 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
			@@ -3188,6 +3348,59 @@
			}

			/// <summary>
			/// 获取当前生产资源下已经开工的生产任务单列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetSc_ICMOBillListView3")]
			[HttpGet]
			public object GetSc_ICMOBillListView3(string ICMOBill, int OrganizationID,int HSourceID)
			{
			if (ICMOBill != "")
			{
			sWhere = " where 1=1 and (单据号 like '%" + ICMOBill + "%' or 产品代码 like '%" + ICMOBill + "%' or 产品名称 like '%" + ICMOBill + "%' or 规格型号 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(行关闭人,'')='' and 状态 = '开工' and HSourceID_b = " + HSourceID + " order by 单据号,hsubid ", "h_v_IF_ICMOBillList");
			}
			else
			{
			string sql = "select * from h_v_IF_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' and isnull(关闭人,'')='' and isnull(行关闭人,'')='' " +
			"and 状态 = '开工' and HSourceID_b = " + HSourceID + " order by 单据号,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>
			@@ -3335,12 +3548,180 @@
			}

			/// <summary>
			/// 获取抽样方案列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetGy_SampleScheme")]
			[HttpGet]
			public object GetSampleScheme(string SampleScheme, int OrganizationID)
			{
			if (SampleScheme != "")
			{
			sWhere = " and ( 抽样方案代码 like '%" + SampleScheme + "%' or 抽样方案名称 like '%" + SampleScheme + "%' ) ";
			}
			try
			{
			List<object> columnNameList = new List<object>();

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select * from h_v_Gy_GetSampleSchemeListView where 1 = 1 " + sWhere + "Order by hmainid ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_GetSampleSchemeListView");

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ",没有查询到数据";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			objjson.list = columnNameList;
			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_InspectValue")]
			[HttpGet]
			public object GetInspectValue(string InspectValue, int OrganizationID)
			{
			if (InspectValue != "")
			{
			sWhere = " and ( 检验值代码 like '%" + InspectValue + "%' or 检验值名称 like '%" + InspectValue + "%' ) ";
			}
			try
			{
			List<object> columnNameList = new List<object>();

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select * from h_v_Gy_GetInspectValueList where 1 = 1 " + sWhere + "Order by hmainid ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_GetInspectValueList");

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ",没有查询到数据";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			objjson.list = columnNameList;
			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_InspectInstruMent")]
			[HttpGet]
			public object GetGy_InspectInstruMent(string InspectInstruMent, int OrganizationID)
			{
			if (InspectInstruMent != "")
			{
			sWhere = " and ( 检验仪器代码 like '%" + InspectInstruMent + "%' or 检验仪器名称 like '%" + InspectInstruMent + "%' ) ";
			}
			try
			{
			List<object> columnNameList = new List<object>();

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select * from h_v_Gy_InspectInstruMent where 1 = 1 " + sWhere + "Order by HItemID ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_InspectInstruMent");

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ",没有查询到数据";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			objjson.list = columnNameList;
			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)
			public object GetCheckItemByCheckProjectID(int CheckProjectID,int HBatchQty)
			{
			if (CheckProjectID <= 0)
			{
			@@ -3353,8 +3734,8 @@
			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");
			string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty;
			ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -3866,35 +4247,56 @@
			}


			#region [查询菜单列表]
			#region [从数据库加载菜单]
			public class MenuLoad
			{
			//public int HitemID { get; set; }
			public string HitemID { get; set; }
			//public int? HPartentID { get; set; }
			public string HPartentID { get; set; }
			public string HNumber { get; set; }
			public string HName { get; set; }
			public int HLevel { get; set; }
			public string Hurl { get; set; }
			public string HPicNum { get; set; }
			public List<MenuLoad> childMenus { get; set; }
			}

			[Route("Web/MenuList")]
			[HttpGet]
			public object MenuList()
			public object MenuList(string HMakeName, string HType)
			{
			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++) //这里是循环所有
			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";
			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 ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			}

			for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //将菜单的根节点保存到列表menu中
			{
			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();
			MenuLoad tbj = new MenuLoad();
			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();
			if (ds.Tables[0].Rows[i]["HPicNum"] != null)
			{
			tbj.HPicNum = ds.Tables[0].Rows[i]["HPicNum"].ToString();
			}
			mu.Add(tbj);
			}
			}
			ToHierarchy.digui(ds.Tables[0], mu);
			diguiLoad(ds.Tables[0], mu); //使用递归，将需要加载的数据以父子级的结构存放在mu中


			objJsonResult.code = "1";
			@@ -3912,7 +4314,499 @@
			return objJsonResult;
			}
			}

			public void diguiLoad(DataTable dt, List<MenuLoad> tree)
			{
			for (int m = 0; m < tree.Count; m++)
			{
			tree[m].childMenus = new List<MenuLoad>();
			for (int i = 0; i < dt.Rows.Count; i++)//第一次循环，得到所有根节点的子集
			{
			if (tree[m].HitemID.ToString() == dt.Rows[i]["HPartentID"].ToString() && dt.Rows[i]["HitemID"].ToString() != dt.Rows[i]["HPartentID"].ToString())
			{
			MenuLoad tbjson = new MenuLoad();
			tbjson.HitemID = dt.Rows[i]["HitemID"].ToString();
			tbjson.HPartentID = dt.Rows[i]["HPartentID"].ToString();
			tbjson.HNumber = dt.Rows[i]["HNumber"].ToString();
			tbjson.HName = dt.Rows[i]["HName"].ToString();
			tbjson.HLevel = tree[m].HLevel;
			tbjson.Hurl = dt.Rows[i]["Hurl"].ToString();
			if (dt.Rows[i]["HPicNum"] != null)
			{
			tbjson.HPicNum = dt.Rows[i]["HPicNum"].ToString();
			}
			tree[m].childMenus.Add(tbjson);
			}
			}
			for (int i = 0; i < tree[m].childMenus.Count; i++)
			{
			diguiLoad(dt, tree[m].childMenus);//再次用子集去循环，拿出子集的子集
			}
			}

			}

			#endregion


			#region [菜单目录自定义]

			#region 读取自定义数据

			//对应Gy_Menu_1表中的记录，记录菜单清单，以及菜单中哪些被选中
			public class MenuInit
			{
			public string HitemID;
			public string HPartentID;
			public string HNumber;
			public string HName;
			public int HLevel;
			public string Hurl;
			public string HType;
			public bool HSelected;
			}

			//获取树状的自定义数据，类中的每个属性都是layui中树组件的渲染参数option的data属性值的参数
			public class MenuDefineList
			{
			public string title { get; set; }
			public string id { get; set; }
			public string field { get; set; }

			public List<MenuDefineList> children { get; set; }
			public bool spread { get; set; }
			public bool selected { get; set; }

			}

			//在自定义菜单界面，获取自定义菜单信息时，通过该类对象返回
			public class MenuDefineResult
			{
			public List<MenuInit> dt; //记录Gy_Menu_1中的菜单清单，以及是否被选中
			public List<MenuDefineList> tree; //根节点列表，在前端经过递归获取所有节点以及各节点是否选中
			}

			//自定义菜单：获取树组件数据
			[Route("Web/MenuDefineSet")]
			[HttpGet]
			public object MenuDefineSet(string HMakeName, string HType)
			{
			try
			{
			//获取构建树状结构的数据
			List<MenuInit> menuInitList = new List<MenuInit>(); //用以获取Gy_Menu_1中的所有菜单信息，以及对应节点是否被选中需要加载显示

			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" +HType + "' Order by HItemID ", "Gy_Menu"); //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充实数据

			DataSet ds1 = new DataSet();
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //将Gy_Menu_1中的菜单信息及选中情况保存到menuInitList列表中，
			{
			//填充基本数据
			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 Gy_MenuDefineSet where HItemID = '" + ds.Tables[0].Rows[i]["HItemID"] + "' and HMakeName='" + HMakeName + "'";
			ds1 = oCn.RunProcReturn(sql, "Gy_MenuDefineSet");
			if (ds1.Tables[0].Rows.Count > 0) //对于Gy_Menu_1表中的菜单节点，通过检索在Gy_MenuDefineSet表中对应用户是否存在该节点的信息，判断该用户是否选中该节点需要加载显示在侧菜单栏
			{
			menuInit.HSelected = true;
			}
			menuInitList.Add(menuInit); //将Gy_Menu_1表中的菜单节点信息逐一添加到menuInitList列表中
			}


			//存储树状结构的数据
			List<MenuDefineList> tree = new List<MenuDefineList>(); //用以获取菜单清单在layui中树组件渲染参数option中data值值的参数
			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 保存自定义数据
			//用户接收前端传递的值：对于前端传递的被选中节点的数据，只需要各节点的id和title属性值，对于类SaveDefineMenu的HItemID、HName属性
			public class SaveDefineMenu
			{
			public string HItemID;
			public string HName;
			}

			//获取自定义菜单数据
			[Route("Web/SaveMenuDefineSet")]
			[HttpPost]
			public object SaveMenuDefineSet([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();
			string HTypes = sArray[2].ToString();
			List<SaveDefineMenu> saveDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SaveDefineMenu>>(saveData);

			//声明数据库操作工具
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

			//设置数据库操作的回滚点，若在提交前报错，则回滚到该点，期间操作取消
			oCN.BeginTran();

			//删除当前用户的自定义数据
			string sql = "delete from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HTypes + "'";
			oCN.RunProc(sql);

			//插入当前用户最新的自定义数据
			for(int i=0;i< saveDataList.Count; i++)
			{
			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 HPartentID = ds.Tables[0].Rows[0]["HPartentID"].ToString();
			string HNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
			int HLevel = int.Parse(ds.Tables[0].Rows[0]["HLevel"].ToString());
			string Hurl = ds.Tables[0].Rows[0]["Hurl"].ToString();
			string HType = ds.Tables[0].Rows[0]["HType"].ToString();
			string HPicNum = ds.Tables[0].Rows[0]["HPicNum"].ToString();

			if(HPartentID == "0" \|\| HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
			{
			string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "')";
			oCN.RunProc(sql);
			}
			else
			{
			sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','z')";
			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

			#endregion



			#region 用户菜单快捷方式自定义

			#region 获取用户快捷方式选择菜单

			//快捷方式自定义菜单：获取树组件数据
			[Route("Web/Xt_UserFastMenu_Display")]
			[HttpGet]
			public object Xt_UserFastMenu_Display(string HMakeName, string HType)
			{
			try
			{
			//获取构建树状结构的数据
			List<MenuInit> menuInitList = new List<MenuInit>(); //用以获取Gy_Menu_1中的所有菜单信息，以及对应节点是否被选中需要加载显示

			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HItemID ", "Gy_Menu"); //获取Gy_Menu_1中的所有菜单信息，用于为menuInitList列表充实数据

			DataSet ds1 = new DataSet();
			for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //将Gy_Menu_1中的菜单信息及选中情况保存到menuInitList列表中，
			{
			//填充基本数据
			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); //将Gy_Menu_1表中的菜单节点信息逐一添加到menuInitList列表中
			}


			//存储树状结构的数据
			List<MenuDefineList> tree = new List<MenuDefineList>(); //用以获取菜单清单在layui中树组件渲染参数option中data值值的参数
			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();
			string HTypes = sArray[2].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 + "' and HType = '" + HTypes + "'";
			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();
			string HType = ds.Tables[0].Rows[0]["HType"].ToString();

			sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "')";
			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, string HType)
			{
			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 + "' and b.HType = '" + HType + "' 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

			#region 保存快捷方式的图标
			[Route("Web/Xt_UserFastMenu_IconSave")]
			[HttpGet]
			public object Xt_UserFastMenu_IconSave(string Icon, string HItemID, string HMakeName)
			{
			try
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			string sql = "update Xt_UserFastMenu set HPicNum = '" + Icon + "' where HSubFuncID='" + HItemID + "' and HUserID = '" + HMakeName + "'";
			oCN.RunProc(sql); //获取Xt_UserFastMenu中该用户设置的自定义菜单信息，用于在前端加载

			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 获取快捷方式的图标
			[Route("Web/Xt_UserFastMenu_IconGet")]
			[HttpGet]
			public object Xt_UserFastMenu_IconGet(string HItemID, string HMakeName)
			{
			try
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			string sql = "select HPicNum from Xt_UserFastMenu where HSubFuncID='" + HItemID + "' and HUserID = '" + HMakeName + "'";
			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

















			///// <summary>
			@@ -4146,6 +5040,114 @@
			return objJsonResult;
			}

			/// <summary>
			/// 获取运输公司列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetConveyCompList_Json")]
			[HttpGet]
			public object GetConveyCompList_Json(string ConveyComp)
			{
			if (ConveyComp != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + ConveyComp + "%' or HName like '%" + ConveyComp + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ConveyComp where HStopflag=0 Order by HItemID ", "Gy_ConveyComp");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber ,HName from Gy_ConveyComp where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_ConveyComp");
			}

			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/GetConveyTypeList_Json")]
			[HttpGet]
			public object GetConveyTypeList_Json(string ConveyType)
			{
			if (ConveyType != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + ConveyType + "%' or HName like '%" + ConveyType + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ConveyType where HStopflag=0 Order by HItemID ", "Gy_ConveyType");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber ,HName from Gy_ConveyType where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_ConveyType");
			}

			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;
			}
			}

			}

			}