~yxj/MES-WEB-API.git

			@@ -67,7 +67,275 @@
			}


			/// <summary>
			/// 返回仓位列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_StockPlace/list1")]
			[HttpGet]
			public object list1(string sWhere)
			{
			try
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_StockPlaceList " + sWhere, "h_v_IF_StockPlaceList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_StockPlaceList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_IF_StockPlaceList");
			}
			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;
			}
			}


			[Route("Gy_StockPlace/LoadTree")]
			[HttpGet]
			public object LoadTree_Json(string sWhere)
			{
			SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
			//ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
			ds = oCN.RunProcReturn("select * from h_v_StockPlaceLoadTree", "h_v_StockPlaceLoadTree");
			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;
			}
			}

			//

			/// <summary>
			/// 新增单据-保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Warehouse/AddNew")]
			[HttpPost]
			public object AddNew([FromBody] JObject oMain)
			{
			try
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			//反序列化
			msg1 = "[" + msg1.ToString() + "]";

			DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
			DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();
			List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg1);

			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			string HHelpCode = list[0].HHelpCode;
			string HShortNumber = list[0].HShortNumber;
			long HParentID = list[0].HParentID;
			long HLevel = list[0].HLevel;
			bool HEndFlag = list[0].HEndFlag;
			bool HStopflag = list[0].HStopflag;
			string HRemark = list[0].HRemark;
			string HBarCode = list[0].HBarCode;
			long HEmpID = list[0].HEmpID;
			string HAddress = list[0].HAddress;
			string HPhone = list[0].HPhone;
			long HUSEORGID = list[0].HUSEORGID;
			string HMaker = list[0].HMaker;

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

			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Insert Into Gy_Warehouse " +
			"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopFlag,HRemark,HBarCode" +
			",HEmpID,HAddress,HPhone,HUSEORGID,HMaker" +
			") " +
			" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
			"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCode + "'" +
			"," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "'," + HUSEORGID.ToString() + ",'" + HMaker + "'" +
			") ");
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			/// <summary>
			/// 修改单据-保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Warehouse/ModifyByID")]
			[HttpPost]
			public object ModifyByID([FromBody] JObject oMain)
			{
			try
			{
			DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
			DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();

			var _value = oMain["oMain"].ToString();
			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();
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);

			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			string HHelpCode = list[0].HHelpCode;
			string HShortNumber = list[0].HShortNumber;
			long HParentID = list[0].HParentID;
			long HLevel = list[0].HLevel;
			bool HEndFlag = list[0].HEndFlag;
			bool HStopflag = list[0].HStopflag;
			string HRemark = list[0].HRemark;
			string HBarCode = list[0].HBarCode;
			long HEmpID = list[0].HEmpID;
			string HAddress = list[0].HAddress;
			string HPhone = list[0].HPhone;
			long HUSEORGID = list[0].HUSEORGID;
			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 (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (oDept.HavSameNumber(HItemID, HNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码重复！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//若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";
			objJsonResult.count = 1;
			objJsonResult.Message = "修改单据成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}





			}
			}