~yxj/MES-WEB-API.git

			@@ -34,7 +34,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -108,7 +108,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -140,7 +140,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -214,7 +214,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -245,7 +245,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -319,7 +319,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -350,7 +350,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -424,7 +424,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -455,7 +455,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -529,7 +529,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1481,6 +1481,48 @@
			}
			#endregion



			#region 出库申请单查询列表
			[Route("OtherOutRequestBillList/CX")]
			[HttpGet]
			public object CX(string sWhere)
			{
			try
			{

			string sql1 = "Select * from AIS20220914133941..T_STK_OUTSTOCKAPPLY where fdocumentstatus = 'C' and FCloseStatus = 'A'";
			string sql2 = "order by Fdate asc";
			string sql = sql1 + sWhere + sql2;
			ds = oCN.RunProcReturn(sql, "T_STK_OUTSTOCKAPPLY");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 根据树型id查找设备列表
			[Route("Gy_MaintenanceMode/EqpCX")]
			[HttpGet]
			@@ -1919,6 +1961,33 @@
			}
			#endregion

			#region 获取全部物料信息
			[Route("PublicPageMethod/MaterialList")]
			[HttpGet]
			public object MaterialList(string sWhere)
			{
			try
			{
			ds = oCN.RunProcReturn("select * from h_v_KF_ICInventoryList_IF" + sWhere , "h_v_KF_ICInventoryList_IF");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 根据树型id查找物料列表
			[Route("Gy_MaintenanceMode/PartCX")]
			[HttpGet]
			@@ -2001,7 +2070,7 @@
			}
			else
			{
			string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
			string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_IF_Unit");
			}
			@@ -2119,22 +2188,12 @@
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_Property");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -2228,7 +2287,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2302,7 +2361,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2333,7 +2392,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2438,7 +2497,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无该组织的用户数据！";
			objJsonResult.Message = "当前组织数据未维护！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -3566,5 +3625,102 @@
			}
			#endregion

			#region 获取核算方式列表
			/// <summary>
			/// 获取核算方式列表
			/// </summary>
			/// <returns></returns>
			[Route("PublicPageMethod/GetClassTimePrjList_Json")]
			[HttpGet]
			public object GetClassTimePrjList_Json(string Gy_ClassTimePrj)
			{
			string sWhere = "";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (Gy_ClassTimePrj != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + Gy_ClassTimePrj + "%' or HName like '%" + Gy_ClassTimePrj + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ClassTimePrjGroup where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrjGroup");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber ,HName from Gy_ClassTimePrjGroup where HStopflag=0 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
			}

			//ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取成功";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取失败" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 选择工序基础资料
			[Route("PublicPageMethod/ProcessList")]
			[HttpGet]
			public object ProcessList(string sWhere)
			{
			try
			{
			ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_Process " + sWhere + " Order by HItemID", "Gy_Process");
			//if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "false！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//else
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}