MES-WEB-API.git

			@@ -293,27 +293,6 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].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("Gy_Warehouse_Edit", 1, false, msg3))
			@@ -324,6 +303,63 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化
			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;
			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;
			//long HCREATEORGID = list[0].HCREATEORGID;
			string HUpDater = list[0].HUpDater;
			long HSPFlag = list[0].HSPFlag;
			//得到短代码
			string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
			if (HShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//等级
			int HLevel = DBUtility.ClsPub.GetLevel(HNumber);

			//检查父级是否存在
			long HParentID = 0;
			string sParent = DBUtility.ClsPub.GetParentCode(HNumber);
			if (sParent.Trim() == "")
			{
			HParentID = 0;
			}
			else
			{
			ds = oCN.RunProcReturn("select * from Gy_Warehouse where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_Warehouse");
			if (ds.Tables[0].Rows.Count>0)
			{
			HParentID =long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			//末级标志
			int HEndFlag = 1;

			//if (!DBUtility.ClsPub.AllowNumber(HNumber))
			//{
			@@ -349,11 +385,18 @@
			oCN.BeginTran();
			oCN.RunProc("Insert into Gy_Warehouse " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HSPFlag,HCREATEORGID,HMaker,HMakeTime) " +
			" 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);
			"," + HLevel.ToString() + "," + HEndFlag + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "',"+ HSPFlag + ","+ HUSEORGID + ",'"+msg3+"',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//启用仓位
			if (HSPFlag == 1)
			{
			//回填 HSPGroupID
			oCN.RunProc("Update Gy_Warehouse set HSPGroupID=HItemID where HNumber='" + HNumber + "' and HName='" + HName + "' ", ref DBUtility.ClsPub.sExeReturnInfo);
			}

			oCN.Commit();
			}
			else {
			@@ -367,12 +410,14 @@
			",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 + "'" +
			",HCREATEORGID='" + HUSEORGID + "'" +
			",HSPFlag='" + HSPFlag + "'" +
			//",HSPGroupID='" + HSPGroupID + "'" +
			",HUpdater='" + HUpDater + "'" +
			",HUpdateDate= getdate()" +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -381,6 +426,16 @@
			//将上级为非末级
			oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			//启用仓位
			if (HSPFlag == 1)
			{
			//回填 HSPGroupID
			oCN.RunProc("Update Gy_Warehouse set HSPGroupID=HItemID where HItemID=" + HItemID , ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else {
			//回填 HSPGroupID
			oCN.RunProc("Update Gy_Warehouse set HSPGroupID=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			oCN.Commit();
			}
			objJsonResult.code = "0";