MES-WEB-API.git

			@@ -9,7 +9,9 @@
			using System.Net.Http;
			using System.Web.Http;
			using WebAPI.Models;

			using System.Web;
			using WebAPI.Controllers.SCGL.æ¥è®¡åç®¡ç;
			using System.IO;

			namespace WebAPI.Controllers.åºç¡èµæ.åºç¡èµæ
			{
			@@ -132,7 +134,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;
			@@ -178,6 +180,7 @@
			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, msg3))
			@@ -218,6 +221,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);
			@@ -268,7 +272,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))
			{
			@@ -295,9 +299,9 @@
			//ä¸»è¡¨
			oCN.RunProc("Insert into Gy_DotCheck " +
			" (HNumber,HName,HHelpCode,HShortNumber" +
			",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HParentID,HDotCheckItemClassID ) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
			+HLevel + ",1," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", 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();
			@@ -318,5 +322,370 @@
			}
			}
			#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 HItemID,HNumber,HName from gy_DotCheckItemClass", "gy_DotCheckItemClass");

			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

			#region ç¹æ£é¡¹ç®æä»¶ä¸ä¼
			[Route("Gy_DotCheck/Gy_DotCheck_Excel")]
			[HttpPost]
			public object Gy_DotCheck_Excel()
			{
			try
			{
			//è·åæä»¶åç§°
			var file = HttpContext.Current.Request.Files[0];
			//è·åæä»¶ç©çè·¯å¾
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//ä¿åæä»¶
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//å é¤æä»¶
			File.Delete(ExcelPath);

			//åå»ºä¸´æ¶è¡¨
			DataTable tb2 = new DataTable("dt2");

			//æ·»å åå
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//æ¨¡æ¿ç¼ºå°å ä½éè¦ä»æ°æ®åºä¸æ¥è¯¢åºæ¥æ¾ç¤ºå¨é¡µé¢çåæ®µ
			tb2.Columns.Add("HOrgID", typeof(Int32));//ç»ç»ID
			tb2.Columns.Add("HDotCheckItemClassID", typeof(Int32));//ç¹æ£é¡¹ç®åç±»ID

			//æ·»å æ°æ®
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			tb2.Rows.Add(row);
			}


			var error = "";

			//æ¥è¯¢å·¥ä½ä¸å¿æ²¡æçå
			if (!tb2.Columns.Contains("ç»ç»ä»£ç "))
			error += "æ²¡ææ¾å°ãç»ç»ä»£ç ãçæ é¢,";

			if (!tb2.Columns.Contains("ç»ç»åç§°"))
			error += "æ²¡ææ¾å°ãç»ç»åç§°ãçæ é¢,";

			if (!tb2.Columns.Contains("ç¹æ£é¡¹ç®ä»£ç "))
			error += "æ²¡ææ¾å°ãç¹æ£é¡¹ç®ä»£ç ãçæ é¢,";

			if (!tb2.Columns.Contains("ç¹æ£é¡¹ç®åç§°"))
			error += "æ²¡ææ¾å°ãç¹æ£é¡¹ç®åç§°ãçæ é¢,";

			if (!tb2.Columns.Contains("ç¹æ£é¡¹ç®åç±»ä»£ç "))
			error += "æ²¡ææ¾å°ãç¹æ£é¡¹ç®åç±»ä»£ç ãçæ é¢,";

			if (!tb2.Columns.Contains("ç¹æ£é¡¹ç®åç±»åç§°"))
			error += "æ²¡ææ¾å°ãç¹æ£é¡¹ç®åç±»åç§°ãçæ é¢,";


			if (error.Length > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"Excelæ¨¡æ¿åå¨éè¯¯,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{

			string HORGNumber = "";
			string HORGName = "";
			string HDotCheckNum = "";
			string HDotCheckName = "";
			string HDotCheckItemClassNum = "";
			string HDotCheckItemClassName = "";

			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["ç»ç»ä»£ç "].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["ç»ç»åç§°"].ToString());
			HDotCheckNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["ç¹æ£é¡¹ç®ä»£ç "].ToString());
			HDotCheckName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["ç¹æ£é¡¹ç®åç§°"].ToString());
			HDotCheckItemClassNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["ç¹æ£é¡¹ç®åç±»ä»£ç "].ToString());
			HDotCheckItemClassName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["ç¹æ£é¡¹ç®åç±»åç§°"].ToString());

			//æ£æ¥ç»ç»
			int index = i + 1;

			if (HORGNumber != "")
			{


			//æ¥è¯¢ç»ç»
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç¬¬" + index + "è¡,ç»ç»ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();


			//æ¥è¯¢ç¹æ£é¡¹ç®åç±»
			ds = oCN.RunProcReturn("select * from Gy_DotCheckItemClass where HNumber='" + HDotCheckItemClassNum + "' and HUSEORGID=" + HORGid + "", "Gy_Department");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç¬¬" + index + "è¡,è¯¥" + HORGName + "ç»ç»,ç¹æ£é¡¹ç®åç±»:" + HDotCheckItemClassName + ",ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HDotCheckItemClassID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}

			//ç¹æ£é¡¹ç®åç§°
			if (HDotCheckName == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç¬¬" + index + "è¡,ç¹æ£é¡¹ç®åç§°ä¸è½ä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//ç¹æ£é¡¹ç®ä»£ç
			if (HDotCheckNum == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç¬¬" + index + "è¡,ç¹æ£é¡¹ç®ä»£ç ä¸è½ä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "ç¬¬" + index + "è¡,ç»ç»ä»£ç ä¸ºç©º";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			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_DotCheck/Gy_DotCheck_btnSave")]
			[HttpPost]
			public object Gy_DotCheck_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&å" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ä¿åæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HOrgID = item["HOrgID"].ToString();//ç»ç»ID
			string HDotCheckItemClassID = item["HDotCheckItemClassID"].ToString();//ç¹æ£é¡¹ç®åç±»ID
			string HDotCheckItemClassName = item["ç¹æ£é¡¹ç®åç±»ä»£ç "].ToString();
			string HDotCheckItemClassNum = item["ç¹æ£é¡¹ç®åç±»åç§°"].ToString();
			string HDotCheckName = item["ç¹æ£é¡¹ç®åç§°"].ToString();
			string HDotCheckNum = item["ç¹æ£é¡¹ç®ä»£ç "].ToString();
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(HDotCheckNum);//çä»£ç
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼çä»£ç ä¸ºç©ºï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			int HEndFlag = 1;//æ«çº§æ å¿
			int HLevel = DBUtility.ClsPub.GetLevel(HDotCheckNum); //ççº§


			if (!DBUtility.ClsPub.AllowNumber(HDotCheckNum.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼ä»£ç ä¸ä¸è½åºç°è¿ç»â.âå¹¶ä¸é¦ä½æ«ä½ä¸è½ä¸ºâ.âï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_DotCheck where HNumber='" + HDotCheckNum + "'", "Gy_DotCheck");

			if (ds.Tables[0].Rows.Count == 0)
			{

			string sql = "insert into Gy_DotCheck(HName,HNumber,HDotCheckItemClassID,HUSEORGID,HCREATEORGID,HShortNumber,HEndFlag,HLevel,HParentID,HStopflag,HRemark,HHelpCode)" +
			$"values('{HDotCheckName}', '{HDotCheckNum}',{HDotCheckItemClassID}, {HOrgID},{HOrgID}, '{sShortNumber}', {HEndFlag},{HLevel},0,0,'','')";
			oCN.RunProc(sql);
			}
			else
			{
			oCN.RunProc(" update Gy_DotCheck set HDotCheckItemClassID=" + HDotCheckItemClassID + " where HNumber='" + HDotCheckNum + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å¯¼å¥æå!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}