~yxj/MES-WEB-API.git

			@@ -25,36 +25,46 @@
			/// </summary>
			[Route("Gy_Warehouse/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere,string user,string Organization)
			{
			try
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_WareHouseList " + sWhere, "h_v_IF_WareHouseList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_WareHouseList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 仓库代码 ", "h_v_IF_WareHouseList");
			}
			else
			{
			string sql = sql1 + sWhere + " order by 仓库代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
			}

			//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)
			{
			@@ -280,9 +290,8 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			//string msg3 = sArray[1].ToString();
			//string msg4 = sArray[2].ToString();
			//string msg5 = sArray[3].ToString();
			string msg3 = sArray[1].ToString();

			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
			@@ -305,14 +314,14 @@
			string HUpDater = list[0].HUpDater;

			////判断权限
			//if (!ClsPub.Security_Log(msg5, 1, true, msg4))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有找到该功能模块！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有找到该功能模块！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//if (!DBUtility.ClsPub.AllowNumber(HNumber))
			//{
			@@ -338,9 +347,9 @@
			oCN.BeginTran();
			oCN.RunProc("Insert into Gy_Warehouse " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
			"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			@@ -361,6 +370,7 @@
			",HEmpID=" + HEmpID.ToString() +
			",HAddress='" + HAddress + "'" +
			",HPhone='" + HPhone + "'" +
			",HUSEORGID='" + HUSEORGID + "'" +
			",HUpdater='" + HUpDater + "'" +
			",HUpdateDate= getdate()" +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -394,21 +404,21 @@
			/// <returns></returns>
			[Route("DeltetGy_Warehouse")]
			[HttpGet]
			public object DeltetGy_Warehouse(string HItemID)
			public object DeltetGy_Warehouse(string HItemID,string user)
			{
			DataSet ds;
			DataSet ds1;
			try
			{
			//删除权限
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "审核失败！无权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))