MES-WEB-API.git

			@@ -11999,8 +11999,8 @@
			string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);
			string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);

			ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//保养
			ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
			ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub_Item");//保养
			ds2 = oCN.RunProcReturn(sql2, "h_v_Sc_MouldMaintainRuleBillSub");//配件
			list.Add(ds1.Tables[0]);
			list.Add(ds2.Tables[0]);
			objJsonResult.code = "0";
			@@ -12134,19 +12134,22 @@
			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=" + 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=" + EquipProjectID);
			// 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=" + 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=" + EquipProjectID);

			ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
			ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
			string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);
			string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);

			ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleBillList");//保养
			ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipMaintainRuleSub");//配件
			list.Add(ds1.Tables[0]);
			list.Add(ds2.Tables[0]);
			objJsonResult.code = "0";
			@@ -12500,13 +12503,8 @@
			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_DotCheck c on c.HItemID=b.HDotCheckItemID
			left join Gy_Employee e on e.HItemID=b.HManagerID
			where a.HInterID=" + HDotCheckRuleInterID);
			ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
			string sql = string.Format(@"select * from h_v_Sb_EquipDotCheckRuleBillList_PDA where HInterID=" + HDotCheckRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleBillList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -12534,6 +12532,149 @@
			}
			}

			/// <summary>
			/// 根据设备保养规程显示设备保养程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetMaintainItemByMaintainRuleID")]
			[HttpGet]
			public object GetMaintainItemByMaintainRuleID(int HEquipMaintainRuleInterID)
			{
			if (HEquipMaintainRuleInterID <= 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_Sb_EquipMaintainRuleBillList_PDA where HInterID=" + HEquipMaintainRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleBillList_PDA");
			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>
			/// 根据器具点检规程显示器具点检程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetDotCheckRuleItemByDotCheckRuleID/Mould")]
			[HttpGet]
			public object GetDotCheckRuleItemByDotCheckRuleIDForMould(int HDotCheckRuleInterID)
			{
			if (HDotCheckRuleInterID <= 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_PDA where HInterID=" + HDotCheckRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList_PDA");
			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>
			/// 根据器具保养规程显示器具保养程项目
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetMaintainItemByMaintainRuleID/Mould")]
			[HttpGet]
			public object GetMaintainItemByMaintainRuleIDForMould(int HMouldMaintainRuleInterID)
			{
			if (HMouldMaintainRuleInterID <= 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_Sb_MouldMaintainRuleBillList_PDA where HInterID=" + HMouldMaintainRuleInterID);
			ds = oCN.RunProcReturn(sql, "h_v_Sb_MouldMaintainRuleBillList_PDA");
			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>
			/// 获取维修项目列表