~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections.Generic;
			@@ -24,16 +25,53 @@
			/// <returns></returns>
			[Route("Sb_EquipDotCheckBill/GetEquipDotCheckBillList")]
			[HttpGet]
			public object GetEquipDotCheckBillList(string sWhere)
			public object GetEquipDotCheckBillList(string sWhere,string user)
			{
			try
			{
			ds = Sb_EquipDotCheckBillList_s(sWhere);
			List<object> columnNameList = new List<object>();
			if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBillList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBillList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipDotCheckBillList");
			}
			else
			{
			string sql1 = "select * from h_v_Sb_EquipDotCheckBillList where 1 = 1";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");
			}
			//添加列名
			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.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			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 ex)
			{
			@@ -56,7 +94,7 @@

			#region 设备点检记录表保存/编辑
			/// <summary>
			/// 保存模具维修单
			/// 点检记录表保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			@@ -69,12 +107,22 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();


			string UserName = "";
			ListModels oListModels = new ListModels();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DAL.ClsSb_EquipDotCheckBill oBill = new DAL.ClsSb_EquipDotCheckBill();
			List<Model.ClsSb_EquipDotCheckBillMain> lsmain = new List<Model.ClsSb_EquipDotCheckBillMain>();
			msg2 = msg2.Replace("\\", "");
			@@ -186,6 +234,7 @@
			}
			}
			#endregion

			#region [设备点检记录表删除功能]
			/// <summary>
			/// 模具维修单删除功能
			@@ -193,17 +242,17 @@
			/// <returns></returns>
			[Route("Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList")]
			[HttpGet]
			public object DeltetEquipDotCheckBillList(string HInterID)
			public object DeltetEquipDotCheckBillList(string HInterID,string user)
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipDotCheckBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;
			@@ -279,6 +328,7 @@
			return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
			}
			#endregion

			#region[设备点检记录表编辑时获取表题数据]
			[Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai")]
			[HttpGet]
			@@ -290,7 +340,7 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select 点检项目 HDotCheckItem,点检部位 HDotCheckPart ,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName from h_v_Sb_EquipDotCheckBillList", "h_v_Sb_EquipDotCheckBillList");
			ds = oCN.RunProcReturn("select 点检项目ID HDotCheckItemID,点检项目代码 as HDotCheckCode ,点检项目 HDotCheckItem,点检部位 HDotCheckPart ,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName from h_v_Sb_EquipDotCheckBillList", "h_v_Sb_EquipDotCheckBillList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -298,7 +348,7 @@
			}
			else
			{
			string sql1 = "select 点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName from h_v_Sb_EquipDotCheckBillList where 1 = 1 ";
			string sql1 = "select 点检项目ID HDotCheckItemID,点检项目代码 as HDotCheckCode ,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName from h_v_Sb_EquipDotCheckBillList where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");
			objJsonResult.code = "0";
			@@ -343,7 +393,7 @@
			return objJsonResult;
			}
			//得到信息
			ds = oCN.RunProcReturn("select top 1 * from Gy_EquipMent where HNumber= '" + HBarCode + "'", "Gy_EquipMent");
			ds = oCN.RunProcReturn("select top 1 * from Gy_EquipFileBillMain where HEquipFileNumber= '" + HBarCode + "'", "Gy_EquipFileBillMain");
			//写入信息
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -380,6 +430,7 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			string UserName = "";

			@@ -436,9 +487,11 @@
			oBill.omodel = oItem;
			}
			//子表体数据

			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			List<Models.ClsSb_EquipDotCheckBillSub> ls = new List<Models.ClsSb_EquipDotCheckBillSub>();
			ls = oListModels.getObjectByJson_Sb_EquipDotCheckBillSubPDA(msg2);
			ls = oListModels.getObjectByJson_Sb_EquipDotCheckBillSubPDA(msg3);
			int i = 0;
			foreach (Models.ClsSb_EquipDotCheckBillSub oItemSub in ls)
			{