~yxj/MES-WEB-API.git

			@@ -106,14 +106,14 @@
			string sql = string.Format(@" select a.* from Gy_UserByOrgRelation a
			where a.HUserID = '{0}' and a.HOrgID = '{1}'", UserName, HOrgName);
			DataSet _ds = oCnLoc.RunProcReturn(sql, "h_p_Xt_UserRelationOrg_Check");
			if (_ds == null \|\| _ds.Tables[0].Rows.Count == 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "用户" + UserName + "没有该组织权限";
			objjson.data = null;
			return objjson;
			}
			//if (_ds == null \|\| _ds.Tables[0].Rows.Count == 0)
			//{
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "用户" + UserName + "没有该组织权限";
			// objjson.data = null;
			// return objjson;
			//}

			objjson.code = "0";
			objjson.count = 1;
			@@ -2093,6 +2093,7 @@
			[HttpGet]
			public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
			{

			if (MouldProjectID <= 0)
			{
			objjson.code = "0";
			@@ -2104,28 +2105,29 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			List<object> list = new List<object>();
			DataSet ds2;
			DataSet ds1;
			string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
			left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
			left join Gy_Employee e on e.HItemID=t.HManagerID
			where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain where HInterID=" + MouldProjectID + ") ");
			ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainRuleBillMain");
			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;
			}

			string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
			left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
			left join h_v_IF_Material m on b.HMaterID=m.HItemID
			left join h_v_IF_Unit u on b.HUnitID=u.HItemID
			where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain where HInterID=" + MouldProjectID + ") ");
			ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//保养
			ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
			list.Add(ds1.Tables[0]);
			list.Add(ds2.Tables[0]);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.list = list;
			return objJsonResult;
			}
			catch (Exception ex)
			{
			@@ -2144,21 +2146,13 @@
			/// <returns></returns>
			[Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")]
			[HttpGet]
			public object GetMouldDotCheckRuleInterList(int MouldProjectID)
			public object GetMouldDotCheckRuleInterList(string sWhere)
			{
			if (MouldProjectID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "产品器具未选择";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList");
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList");
			string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
			ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -2186,6 +2180,111 @@
			}
			}

			/// <summary>
			/// 根据设备显示设备保养规程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetMaintainItemtemByEquipProjectID")]
			[HttpGet]
			public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
			{
			if (EquipProjectID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "产品器具未选择";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			List<object> list = new List<object>();
			DataSet ds2;
			DataSet ds1;
			string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
			from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
			left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
			left join Gy_Employee e on e.HItemID=t.HManagerID
			where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
			string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
			left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
			left join h_v_IF_Material m on b.HMaterID=m.HItemID
			left join h_v_IF_Unit u on b.HUnitID=u.HItemID
			where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");

			ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
			ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
			list.Add(ds1.Tables[0]);
			list.Add(ds2.Tables[0]);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.list = list;
			return objJsonResult;
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 根据设备显示设备点检程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetDotCheckRuleItemByEquipProjectID")]
			[HttpGet]
			public object GetDotCheckRuleItemByEquipProjectID(int EquipProjectID)
			{
			if (EquipProjectID <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "产品器具未选择";
			objjson.data = null;
			return objjson;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
			b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
			left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
			left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
			left join Gy_Employee e on e.HItemID=b.HManagerID
			where a.HInterID=(select HEquipDotCheckRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
			ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
			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>
			/// 获取维修项目列表