~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -25,36 +26,45 @@
			/// </summary>
			[Route("Gy_Supplier/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_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 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_Gy_SupplierList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 供应商代码", "h_v_Gy_SupplierList");
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			string sql = sql1 + sWhere + " order by 供应商代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
			}

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -109,7 +119,16 @@
			{
			try
			{
			ds = oCN.RunProcReturn("select * from Gy_Supplier where HItemID=" + HInterID, "Gy_Supplier");
			string sql = string.Format(@"select s.HItemID,s.HNumber 编码,s.HName 名称,s.HHelpCode 助记码,s.HShortName 简称,s.HAddress 地址,s.HLinkMan 联系人,s.HLinkPhone 联系电话
			,s.HMobilePhone 手机,s.HFax 传真,s.HPostalCode 邮编,s.HEmail 电子邮件,s.HCorMan 法人代表,s.HBank 开户银行,s.HBankAccount 银行账号,
			s.HTaxNum 税务登记号,s.HEnglishName 英文名称,s.HEngLishAddress 英文地址,s.HCountry 国家,s.HStopflag 禁用标志
			,s.HRemark 备注,s.HAreaID 地区ID,a.HName 地区名称,s.HTaxRate 增值税率,s.HCurID 默认货币ID,r.HName 默认货币,
			s.HSSID 结算方式ID,e.HName 结算方式 from Gy_Supplier s
			left join Gy_AreaSet a on s.HAreaID=a.HItemID
			left join Gy_Currency r on s.HCurID=r.HItemID
			left join Gy_SettleStyle e on s.HSSID=e.HItemID
			where s.HItemID='" + HInterID + "'");
			ds = oCN.RunProcReturn(sql, "Gy_Supplier");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -151,13 +170,14 @@

			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);

			long HItemID = list[0].HItemID;
			long HItemID = list[0].HInterID;
			string HNumber = list[0].HNumber;
			string HShortNumber = list[0].HShortNumber;
			string HName = list[0].HName;
			long HParentID = list[0].HParentID;
			long HLevel = list[0].HLevel;
			string HEndFlag = list[0].HEnfFlag;
			string HStopflag = list[0].HStopflag;
			string HHelpCode = list[0].HHelpCode;
			string HShortName = list[0].HShortName;
			string HAddress = list[0].HAddress;
			@@ -208,7 +228,7 @@
			",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
			",HEnglishAddress,HCurID,HSSID,HAreaID) " +
			" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
			"," + HLevel + ",'0','0','" + HRemark + "'" +
			"," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
			",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
			",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
			",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
			@@ -253,21 +273,22 @@
			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();
			string msg2 = sArray[0].ToString(); //表头数据
			string msg3 = sArray[1].ToString(); //列表主ID
			string msg4 = sArray[2].ToString(); //登录人员
			string msg5 = sArray[3].ToString(); //权限模块代码
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);

			long HItemID = list[0].HItemID;
			long HItemID = list[0].HInterID;
			string HNumber = list[0].HNumber;
			string HShortNumber = list[0].HShortNumber;
			string HName = list[0].HName;
			long HParentID = list[0].HParentID;
			long HLevel = list[0].HLevel;
			string HEndFlag = list[0].HEnfFlag;
			string HStopflag = list[0].HStopflag;
			string HHelpCode = list[0].HHelpCode;
			string HShortName = list[0].HShortName;
			string HAddress = list[0].HAddress;
			@@ -297,11 +318,11 @@


			//判断权限
			if (!ClsPub.Security_Log(msg5, 1, true, msg4))
			if (!ClsPub.Security_Log(msg5, 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有找到该功能模块！";
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -316,25 +337,39 @@
			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_Supplier set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HParentID=" + HParentID +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HParentID=" + HParentID.ToString() +
			",HLevel=" + HLevel.ToString() +
			",HStopflag ='" + HStopflag + "'" +
			",HRemark= '" + HRemark + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HShortName='" + HShortName + "'" +
			",HAddress='" + HAddress + "'" +
			",HLinkMan='" + HLinkMan + "'" +
			",HLinkPhone='" + HLinkPhone + "'" +
			",HMobilePhone='" + HMobilePhone + "'" +
			",HFax='" + HFax + "'" +
			",HPostalCode='" + HPostalCode + "'" +
			",HEmail='" + HEmail + "'" +
			",HBank='" + HBank + "'" +
			",HBankAccount='" + HBankAccount + "'" +
			",HTaxNum='" + HTaxNum + "'" +
			",HTaxRate=" + HTaxRate.ToString() +
			",HCountry='" + HCountry + "'" +
			",HCorMan='" +HCorMan + "'" +
			",HEnglishName='" + HEnglishName + "'" +
			",HEnglishAddress='" + HEnglishAddress + "'" +
			",HCurID=" + HCurID.ToString() +
			",HSSID=" + HSSID.ToString() +
			",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);


			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			@@ -373,7 +408,7 @@
			DAL.ClsGy_Supplier_View oGroupHlp = new DAL.ClsGy_Supplier_View();
			try
			{
			if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
			if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;