MES-WEB-API.git

			@@ -833,6 +833,72 @@
			}


			///// <summary>
			///// 获取仓位列表
			///// </summary>
			///// <returns></returns>
			//[Route("Web/GetStockPlaceList_Json_NEW")]
			//[HttpGet]
			//public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
			//{
			// WebS.WebService1 oWeb = new WebS.WebService1();
			// sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
			// //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			// if (HWhID == 0)
			// {
			// if (StockPlace != "")
			// {
			// sWhere = " Where HStopFlag=0 and HUSEORGID = " + HOrgID + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
			// }
			// else
			// {
			// sWhere = " Where HStopFlag=0 ";
			// }
			// }
			// else
			// {
			// if (StockPlace != "")
			// {
			// sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
			// }
			// else
			// {
			// sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
			// }
			// }
			// try
			// {
			// //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			// ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			// 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 = "0";
			// 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>
			@@ -955,7 +1021,7 @@
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (Supplier != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
			sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + HOrgID + "%' ) ";
			}
			try
			{
			@@ -1286,6 +1352,227 @@
			}

			/// <summary>
			/// 获取计量单位组列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetUnitGroupList_Json")]
			[HttpGet]
			public object GetUnitGroupList_Json(string Unit)
			{
			//sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (Unit != "" && Unit != null)
			{
			sWhere = sWhere + " and ( HNumber like '%" + Unit + "%' or HName like '%" + Unit + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber 计量单位组代码,HName 计量单位组 from Gy_UnitGroup where HStopflag=0 Order by HItemID ", "Gy_UnitGroup");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber 计量单位组代码,HName 计量单位组 from Gy_UnitGroup where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_UnitGroup");
			}

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


			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 = "0";
			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/GetSellStyleList_Json")]
			[HttpGet]
			public object GetSellStyleList_Json(string SellStyle)
			{
			if (SellStyle != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + SellStyle + "%' or HName like '%" + SellStyle + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_SellStyle where HStopflag=0 Order by HItemID ", "Gy_SellStyle");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber ,HName from Gy_SellStyle where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_SellStyle");
			}

			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 = "0";
			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/GetSettleStyleList_Json")]
			[HttpGet]
			public object GetSettleStyleList_Json(string SettleStyle)
			{
			if (SettleStyle != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + SettleStyle + "%' or HName like '%" + SettleStyle + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_SettleStyle where HStopflag=0 Order by HItemID ", "Gy_SettleStyle");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber ,HName from Gy_SettleStyle where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_SettleStyle");
			}

			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 = "0";
			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/GetPoStockStyleList_Json")]
			[HttpGet]
			public object GetPoStockStyleList_Json(string PoStockStyle)
			{
			if (PoStockStyle != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + PoStockStyle + "%' or HName like '%" + PoStockStyle + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_PoStockStyle where HStopflag=0 Order by HItemID ", "Gy_PoStockStyle");
			}
			else
			{
			string sql1 = "Select HItemID,HNumber ,HName from Gy_PoStockStyle where HStopflag=0 and HEndFlag=1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_PoStockStyle");
			}

			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 = "0";
			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>
			@@ -1351,6 +1638,104 @@
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("Select HItemID,HNumber 工序代码,HName 工序 from Gy_Process where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Process");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception e)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取物料列表
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Web/GetMaterList_Json")]
			[HttpGet]
			public object GetMaterList_Json(string sWhere)
			{
			DataSet ds;
			//sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (sWhere != "")
			{
			sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("Select HItemID,HNumber 物料代码,HName 物料,HModel 规格型号 from Gy_Material where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Material");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception e)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + e.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取模具列表
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Web/GetRelationList_Json")]
			[HttpGet]
			public object GetRelationList_Json(string sWhere)
			{
			DataSet ds;
			//sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (sWhere != "")
			{
			sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("Select HItemID,HNumber 模具代码,HName 模具,HModel 规格型号 from h_v_Gy_Mould where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_Gy_Mould");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -2469,6 +2854,124 @@
			}

			/// <summary>
			/// 获取设备主档列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetGy_EquipFileBillMainList_Json")]
			[HttpGet]
			public object GetGy_EquipFileBillMainList_Json(string EquipFileBill)
			{
			//sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (EquipFileBill != "")
			{
			sWhere = sWhere + " and ( HEquipFileNumber like '%" + EquipFileBill + "%' or HName like '%" + EquipFileBill + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
			}
			else
			{
			string sql1 = "Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_EquipFileBillMain");
			}

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


			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 = "0";
			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/GetGy_MouldFileMainList_Json")]
			[HttpGet]
			public object GetGy_MouldFileMainList_Json(string MouldFileMain)
			{
			//sWhere = " Where HStopFlag=0 and HEndFlag=1";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (MouldFileMain != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + MouldFileMain + "%' or HName like '%" + MouldFileMain + "%' ) ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("Select HInterID,HNumber,HName from Gy_MouldFileMain where 0=0 Order by HInterID ", "Gy_MouldFileMain");
			}
			else
			{
			string sql1 = "Select HInterID,HNumber,HName from Gy_MouldFileMain where 0=0 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_MouldFileMain");
			}

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


			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 = "0";
			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>
			@@ -2891,7 +3394,7 @@
			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
			string sql1 = string.Format(@"select a.HInterID,a.HBillNo,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
			@@ -3022,9 +3525,9 @@
			/// <returns></returns>
			[Route("Web/GetMaintainItemtemByEquipProjectID")]
			[HttpGet]
			public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
			public object GetMaintainItemtemByEquipProjectID(string EquipProjectID)
			{
			if (EquipProjectID <= 0)
			if (EquipProjectID == null)
			{
			objjson.code = "0";
			objjson.count = 0;
			@@ -3038,7 +3541,7 @@
			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
			string sql1 = string.Format(@"select a.HInterID,a.HBillNo,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
			@@ -3538,6 +4041,38 @@
			}
			}
			#endregion

			/// <summary>
			/// 获取流水号列表
			/// </summary>
			/// <param name="HInterID"></param>
			/// <returns></returns>
			[Route("Web/GetProcNoList")]
			[HttpGet]
			public object GetProcNoList(int HInterID,string sWhere,string UserID)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");

			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 = e.Message.ToString();
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			}
			return objJsonResult;
			}

			}

			}