MES-WEB-API.git

			@@ -1,4 +1,5 @@
			ï»¿using DBUtility;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using System;
			using System.Collections.Generic;
			@@ -29,6 +30,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			if (!DBUtility.ClsPub.Security_Log("Gy_DotCheck", 1, false, user))
			{
			objJsonResult.code = "0";
			@@ -37,23 +39,33 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCN.RunProcReturn("select HItemID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_DotCheck where 1=1 " + sWhere+ " order by HNumber", "Gy_DotCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			ds = oCN.RunProcReturn("select * from h_v_Gy_DotCheckList where 1=1 " + sWhere+ " order by HItemID", "h_v_Gy_DotCheckList");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ä¿å»é¡¹ç®æ°æ®ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ¥æ¾æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "æ æ°æ®";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -120,7 +132,7 @@
			{
			try
			{
			ds = oCN.RunProcReturn("select * from Gy_DotCheck where HItemID=" + HInterID, "Gy_DotCheck");
			ds = oCN.RunProcReturn("select * from h_v_Gy_DotCheck_Edit where HItemID=" + HInterID, "h_v_Gy_DotCheck_Edit");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -158,7 +170,7 @@
			msg2 = "[" + msg2.ToString() + "]";
			List<Models.ClsGy_DotCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_DotCheck>>(msg2);

			long HItemID = int.Parse(msg3);
			long HItemID = int.Parse(msg4);
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			string HShortNumber = list[0].HNumber;
			@@ -166,9 +178,10 @@
			string HRemark = list[0].HRemark;
			bool HStopflag = list[0].HStopflag;
			string HUseFlag = list[0].HUseFlag;
			Int64 HDotCheckItemClassID = list[0].HDotCheckItemClassID;

			//å¤ææé
			if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg4))
			if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg3))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -187,14 +200,14 @@
			return objJsonResult;
			}

			if (oDept.HavSameNumber(HItemID, HNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä»£ç éå¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//if (oDept.HavSameNumber(HItemID, HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "ä»£ç éå¤ï¼";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}


			//è¥MAINDIéå¤åéæ°è·å
			@@ -206,6 +219,7 @@
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HStopflag='" + HStopflag + "'" +
			",HDotCheckItemClassID=" + HDotCheckItemClassID +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//ä¿®æ¹åé¡¹ç®ä»£ç
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -256,7 +270,7 @@
			bool HStopflag = list[0].HStopflag;
			string HUseFlag = list[0].HUseFlag;
			bool HEndFlag = list[0].HEndFlag;

			Int64 HDotCheckItemClassID = list[0].HDotCheckItemClassID;
			//å¤ææé
			if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg3))
			{
			@@ -283,9 +297,9 @@
			//ä¸»è¡¨
			oCN.RunProc("Insert into Gy_DotCheck " +
			" (HNumber,HName,HHelpCode,HShortNumber" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HParentID,HDotCheckItemClassID ) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
			+HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			+HLevel + ",1," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0," + HDotCheckItemClassID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//ä¿®æ¹ä¸çº§ä¸ºéæ«çº§ä»£ç
			//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			@@ -306,5 +320,85 @@
			}
			}
			#endregion

			#region ç¹æ£é¡¹ç®åè¡¨ æ ç¶å¾ ç¹å»åç±»æ¥è¯¢
			public class TreeModel
			{
			public string id { get; set; }
			public string title { get; set; }
			public List<TreeModel> children = new List<TreeModel>();
			}
			[Route("Gy_DotCheckBill/TreeGetList")]
			[HttpGet]
			public object TreeGetList(string sWhere, string user)
			{
			try
			{

			ds = oCN.RunProcReturn("select b.HItemID,b.HNumber,b.HName from Gy_DotCheck a left join gy_DotCheckItemClass b on a.HDotCheckItemClassID=b.HItemID", "Gy_DotCheck");

			List<TreeModel> treeModels = new List<TreeModel>();
			TreeModel first = new TreeModel();
			first.id = "0";
			first.title = "ç¹æ£é¡¹ç®åç±»è®¾ç½®";
			treeModels.Add(first);

			foreach (DataRow row in ds.Tables[0].Rows)
			{
			var strLen = row["hitemid"].ToString().Split('.');
			if (strLen.Length == 1)
			{
			TreeModel tree = new TreeModel();
			tree.id = row["HItemID"].ToString();
			tree.title = row["HName"].ToString();
			treeModels[0].children.Add(tree);
			}
			}
			digui(ds.Tables[0], treeModels[0].children, 2);


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			/// <summary>
			/// éå½å½æ°
			/// </summary>
			public void digui(DataTable dt, List<TreeModel> tree, int num)
			{
			for (int m = 0; m < tree.Count; m++)
			{
			tree[m].children = new List<TreeModel>();
			for (int i = 0; i < dt.Rows.Count; i++)//ç¬¬ä¸æ¬¡å¾ªç¯ï¼å¾å°æææ ¹èç¹çåé
			{
			var strLen = dt.Rows[i]["HNumber"].ToString().Split('.');
			if (strLen.Length == num && dt.Rows[i]["HNumber"].ToString().Contains(tree[m].id + "."))
			{
			TreeModel tbjson = new TreeModel();
			tbjson.id = dt.Rows[i]["HItemID"].ToString();
			tbjson.title = dt.Rows[i]["HName"].ToString();
			tree[m].children.Add(tbjson);
			}
			}
			var strLens = tree[m].id.Split('.');
			for (int i = 0; i < tree[m].children.Count; i++)
			{
			digui(dt, tree[m].children, strLens.Length + 2);//åæ¬¡ç¨åéå»å¾ªç¯ï¼æ¿åºåéçåé
			}
			}

			}
			#endregion
			}
			}