~yxj/MES-WEB-API.git

			@@ -25,20 +25,59 @@
			/// </summary>
			[Route("Gy_Warehouse/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere,string user,string Organization)
			{
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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("select * from h_v_IF_WareHouseList " + sWhere, "h_v_IF_WareHouseList");
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 仓库代码 ", "h_v_IF_WareHouseList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_WareHouseList where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + " order by 仓库代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
			}


			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;
			}
			}
			/// <summary>
			/// 根据基础资料ID 查找记录
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Warehouse/cx")]
			[HttpGet]
			public object cx(long HInterID)
			{
			try
			{

			ds = oCN.RunProcReturn("select * from h_v_IF_WareHouseListDetail where HitemID=" + HInterID, "h_v_IF_WareHouseListtDetail");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -66,6 +105,7 @@
			}
			}

			//

			/// <summary>
			/// 返回仓位列表
			@@ -80,7 +120,7 @@
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_StockPlaceList " + sWhere, "h_v_IF_StockPlaceList");
			ds = oCN.RunProcReturn("select * from h_v_IF_StockPlaceList where 1=1" , "h_v_IF_StockPlaceList");
			}
			else
			{
			@@ -223,7 +263,7 @@


			/// <summary>
			/// 修改单据-保存按钮
			/// 保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			@@ -241,8 +281,7 @@
			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();

			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
			@@ -264,8 +303,8 @@
			long HUSEORGID = list[0].HUSEORGID;
			string HUpDater = list[0].HUpDater;

			//判断权限
			if (!ClsPub.Security_Log(msg5, 1, true, msg4))
			////判断权限
			if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -274,52 +313,69 @@
			return objJsonResult;
			}

			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//if (!DBUtility.ClsPub.AllowNumber(HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			if (oDept.HavSameNumber(HItemID, HNumber))
			//if (oDept.HavSameNumber(HItemID, HNumber))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "代码重复！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//保存
			//保存完毕后处理
			if (HItemID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码重复！";
			objJsonResult.data = null;
			return objJsonResult;
			oCN.BeginTran();
			oCN.RunProc("Insert into Gy_Warehouse " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",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 + "','"+ HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			}

			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_Warehouse set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HLevel=" + HLevel.ToString() +
			",HParentID=" + HParentID.ToString() +
			",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
			",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
			",HEmpID=" + HEmpID.ToString() +
			",HAddress='" + HAddress + "'" +
			",HPhone='" + HPhone + "'" +
			",HUpdater='" + HUpDater + "'" +
			",HUpdateDate= getdate()" +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			objJsonResult.code = "1";
			else {
			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_Warehouse set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HLevel=" + HLevel.ToString() +
			",HParentID=" + HParentID.ToString() +
			",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
			",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
			",HEmpID=" + HEmpID.ToString() +
			",HAddress='" + HAddress + "'" +
			",HPhone='" + HPhone + "'" +
			",HUSEORGID='" + HUSEORGID + "'" +
			",HUpdater='" + HUpDater + "'" +
			",HUpdateDate= getdate()" +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "修改单据成功！";
			//objJsonResult.data = null;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -332,6 +388,94 @@
			return objJsonResult;
			}
			}
			/// <summary>
			/// 仓库列表删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_Warehouse")]
			[HttpGet]
			public object DeltetGy_Warehouse(string HItemID,string user)
			{
			DataSet ds;
			DataSet ds1;
			try
			{
			//删除权限
			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))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Gy_Warehouse where HItemID=" + HItemID, "Gy_Warehouse");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}
			//var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
			//if (HStopflag)
			//{
			// oCN.RollBack();//回滚事务
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "数据已删除无法再次删除！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			ds1 = oCN.RunProcReturn("Select HItemID from Gy_Warehouse Where HParentID='" + HItemID + "'", "Gy_Warehouse");
			if (ds1.Tables[0].Rows.Count != 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此项目存在子项目，不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
			if (HUseFlag == "已使用")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此项目已使用，不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("delete from Gy_Warehouse where HItemID=" + HItemID);
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "* 数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}