MES-WEB-API.git

			@@ -79,6 +79,55 @@
			return objjson;
			}
			}



			//[Route("Web/Get_MaxBillNoAndID")]
			//[HttpGet]
			//public object Get_MaxBillNoAndID(string HBillType)
			//{
			// try
			// {
			// string HBillNo = "";
			// Int64 HInterID = 0;//显示的字段
			// HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
			// HBillNo = DBUtility.ClsPub.CreateBillCode(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			// //----------创建虚表------------------------
			// DataTable dt_Main = new DataTable("Json");
			// dt_Main.Columns.Add("HBillNo", typeof(string));
			// dt_Main.Columns.Add("HInterID", typeof(int));
			// //---------创建新行------------------------
			// DataRow dr_main = dt_Main.NewRow();//创建新行
			// dt_Main.Rows.Add(dr_main);//将新行加入到表中
			// dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
			// dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);

			// if (HBillNo == null \|\| HInterID == 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 = dt_Main;
			// return objjson;
			// }
			// }
			// catch (Exception e)
			// {
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "获取失败" + e.ToString();
			// objjson.data = null;
			// return objjson;
			// }
			//}
			/// <summary>
			/// 登录
			/// </summary>
			@@ -955,7 +1004,7 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("Select HItemID,HNumber 班组代码,HName 班组 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
			ds = oCN.RunProcReturn("Select HItemID,班组代码班组代码,班组名称班组 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -2153,6 +2202,58 @@
			return objjson;
			}
			}
			/// <summary>
			/// 核算方式组编辑
			/// </summary>
			/// <param name="sWhere"></param>
			/// <param name="user"></param>
			/// <returns></returns>
			[Route("Web/GetClassTimePrjGroupBillEdit_Json")]
			[HttpGet]
			public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
			{
			//if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有查看权限";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 仓库名称 from Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
			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;
			}
			}


			#region 删除核算方式组
			/// <summary>
			/// 核算方式列表删除按钮