MES-WEB-API.git

			@@ -1752,8 +1752,8 @@
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HCusID", typeof(Int32));//组织ID
			tb2.Columns.Add("HUserID", typeof(Int32));//供应商
			tb2.Columns.Add("客户内码", typeof(string));//客户内码
			tb2.Columns.Add("判定结果", typeof(string));//判定结果

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			@@ -1768,6 +1768,14 @@

			//查询Excel文件中没有的列
			var error = "";
			if (!tb2.Columns.Contains("用户代码"))
			{
			error += "没有找到【用户代码】的标题,";
			}
			if (!tb2.Columns.Contains("用户名称"))
			{
			error += "没有找到【用户名称】的标题,";
			}
			if (!tb2.Columns.Contains("客户代码"))
			{
			error += "没有找到【客户代码】的标题,";
			@@ -1776,9 +1784,13 @@
			{
			error += "没有找到【客户名称】的标题,";
			}
			if (!tb2.Columns.Contains("用户名称"))
			if (!tb2.Columns.Contains("组织代码"))
			{
			error += "没有找到【用户名称】的标题,";
			error += "没有找到【组织代码】的标题,";
			}
			if (!tb2.Columns.Contains("组织名称"))
			{
			error += "没有找到【组织名称】的标题,";
			}
			if (error.Length > 0)
			{
			@@ -1790,68 +1802,66 @@
			}

			//查询数据赋给数据表
			string err = "";
			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HUserID = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["用户代码"].ToString());
			string HUserName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["用户名称"].ToString());
			string HCusNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["客户代码"].ToString());
			string HCusName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["客户名称"].ToString());
			string HUserName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["用户名称"].ToString());
			string HOrgNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
			string HOrgName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
			int index = i + 1;
			string sql = "";
			if (HCusNumber != "" && HUserName != "")
			{
			//获取客户内码
			sql = "select * from Gy_Customer where HNumber = '" + HCusNumber + "'";
			string HCusID = "0";
			ds = oCN.RunProcReturn(sql, "Gy_Customer");
			if (ds.Tables[0].Rows.Count == 0)
			{
			err += "第" + index + "行,客户不存在!";
			continue;
			}
			else
			{
			tb2.Rows[i]["HCusID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			HCusID = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			//string sql = "";

			//获取用户内码
			sql = "select * from Gy_Czygl where Czymc = '" + HUserName + "'";
			string HUserID = "";
			ds = oCN.RunProcReturn(sql, "Gy_Czygl");
			if (ds.Tables[0].Rows.Count == 0)
			{
			err += "第" + index + "行,用户不存在!";
			continue;
			}
			else
			{
			tb2.Rows[i]["HUserID"] = ds.Tables[0].Rows[0]["Czybm"].ToString();
			HUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
			}
			////判定用户是否存在并设置数据
			//sql = "select * from Gy_Czygl where Czybm = '" + HUserID + "'";
			//ds = oCN.RunProcReturn(sql, "Gy_Czygl");
			//if (ds.Tables[0].Rows.Count > 0)
			//{
			// tb2.Rows[i]["用户名称"] = ds.Tables[0].Rows[0]["Czymc"];
			//}
			//else
			//{
			// sql = "select * from Gy_Czygl where Czymc = '" + HUserName + "'";
			// ds = oCN.RunProcReturn(sql, "Gy_Czygl");
			// if (ds.Tables[0].Rows.Count > 0)
			// {
			// tb2.Rows[i]["用户代码"] = ds.Tables[0].Rows[0]["Czybm"];
			// }
			//}

			//判断表中是否已经存在该用户关联客户
			sql = "select * from Gy_UserCustomerRelation where HCusID = " + HCusID + " and HUserID = '" + HUserID + "'";
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			{
			err += "第" + index + "行，该用户与客户已经关联!";
			continue;
			}
			}
			else
			{
			err += "第" + index + "行,客户代码或用户名称为空!";
			continue;
			}
			}
			if (err.Length > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "导入错误：" + err;
			objJsonResult.data = null;
			return objJsonResult;
			////判定客户是否存在并设置数据
			//sql = "select c.HItemID 客户内码,c.HNumber 客户代码,c.HName 客户名称,isnull(c.HUSEORGID,0) 组织内码,isnull(o.HNumber,'') 组织代码,isnull(o.Hname,'') 组织名称 from " +
			// "Gy_Customer as c " +
			// "left join Xt_ORGANIZATIONS o on c.HUSEORGID = o.HItemID " +
			// "where " +
			// "c.HNumber = '" + HCusNumber + "' " +
			// "and isnull(o.HNumber,'')<>'' and isnull(o.HNumber,'') = '" + HOrgNumber + "'";
			//ds = oCN.RunProcReturn(sql, "Gy_Customer");
			//if(ds.Tables[0].Rows.Count > 0)
			//{
			// tb2.Rows[i]["客户内码"] = ds.Tables[0].Rows[0]["客户内码"];
			// tb2.Rows[i]["客户名称"] = ds.Tables[0].Rows[0]["客户名称"];
			// tb2.Rows[i]["组织名称"] = ds.Tables[0].Rows[0]["组织名称"];
			//}
			//else
			//{
			// sql = "select c.HItemID 客户内码,c.HNumber 客户代码,c.HName 客户名称,isnull(c.HUSEORGID,0) 组织内码,isnull(o.HNumber,'') 组织代码,isnull(o.Hname,'') 组织名称 from " +
			// "Gy_Customer as c " +
			// "left join Xt_ORGANIZATIONS o on c.HUSEORGID = o.HItemID " +
			// "where " +
			// "c.HNumber = '" + HCusNumber + "' " +
			// "and isnull(o.HName,'')<>'' and isnull(o.HName,'') = '" + HOrgName + "'";
			// ds = oCN.RunProcReturn(sql, "Gy_Customer");
			// if (ds.Tables[0].Rows.Count > 0)
			// {
			// tb2.Rows[i]["客户内码"] = ds.Tables[0].Rows[0]["客户内码"];
			// tb2.Rows[i]["客户名称"] = ds.Tables[0].Rows[0]["客户名称"];
			// tb2.Rows[i]["组织代码"] = ds.Tables[0].Rows[0]["组织代码"];
			// }
			//}

			tb2.Rows[i]["判定结果"] = "";
			}

			objJsonResult.code = "1";
			@@ -1870,6 +1880,172 @@
			}
			}
			#endregion
			#region 用户关联客户导入(数据验证)
			[Route("Xt_User/Gy_UserCustomer_ImportByExcel_Confirm")]
			[HttpPost]
			public object Gy_UserCustomer_ImportByExcel_Confirm([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			string[] importFieldList = sArray[2].ToString().Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			try
			{
			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			//创建临时表并设置列名
			DataTable tb2 = new DataTable("dt2");
			tb2.Columns.Add("用户代码", typeof(string));
			tb2.Columns.Add("用户名称", typeof(string));
			tb2.Columns.Add("客户内码", typeof(string));
			tb2.Columns.Add("客户代码", typeof(string));
			tb2.Columns.Add("客户名称", typeof(string));
			tb2.Columns.Add("组织代码", typeof(string));
			tb2.Columns.Add("组织名称", typeof(string));
			tb2.Columns.Add("判定结果", typeof(string));

			string error = "";
			int i = 1;
			string sql = "";
			foreach (Dictionary<string, string> item in list)
			{
			//记录判定结果
			string err = "";

			DataRow row = tb2.NewRow();
			tb2.Rows.Add(row);
			string HUserID = item["用户代码"].ToString();
			string HUserName = item["用户名称"].ToString();
			string HCusID = item["客户内码"].ToString();
			string HCusNumber = item["客户代码"].ToString();
			string HCusName = item["客户名称"].ToString();
			string HOrgNumber = item["组织代码"].ToString();
			string HOrgName = item["组织名称"].ToString();

			tb2.Rows[i - 1]["用户代码"] = HUserID;
			tb2.Rows[i - 1]["用户名称"] = HUserName;
			tb2.Rows[i - 1]["客户内码"] = HCusID;
			tb2.Rows[i - 1]["客户代码"] = HCusNumber;
			tb2.Rows[i - 1]["客户名称"] = HCusName;
			tb2.Rows[i - 1]["组织代码"] = HOrgNumber;
			tb2.Rows[i - 1]["组织名称"] = HOrgName;
			tb2.Rows[i - 1]["判定结果"] = "";

			//根据导入字段获取用户相关数据，并进行校验
			sql = "";
			if (importFieldList[0] == "HUserID")
			{
			sql = "select * from Gy_Czygl where Czybm = '" + HUserID + "'";
			}
			else if(importFieldList[0] == "HUserName")
			{
			sql = "select * from Gy_Czygl where Czymc = '" + HUserName + "'";
			}
			ds = oCN.RunProcReturn(sql, "Gy_Czygl");
			if (ds.Tables[0].Rows.Count == 0)
			{
			err += "用户不存在；";
			}
			else
			{
			tb2.Rows[i - 1]["用户代码"] = ds.Tables[0].Rows[0]["Czybm"];
			tb2.Rows[i - 1]["用户名称"] = ds.Tables[0].Rows[0]["Czymc"];

			HUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
			HUserName = ds.Tables[0].Rows[0]["Czymc"].ToString();
			}

			//根据导入字段获取客户相关数据，并进行校验
			sql = "";
			if (importFieldList[1] == "HOrgNumber")
			{
			sql = "select * from Xt_ORGANIZATIONS where HNumber = '" + HOrgNumber + "'";
			}
			else if (importFieldList[1] == "HOrgName")
			{
			sql = "select * from Xt_ORGANIZATIONS where HName = '" + HOrgName + "'";
			}
			ds = oCN.RunProcReturn(sql, "Xt_ORGANIZATIONS");
			if (ds.Tables[0].Rows.Count == 0)
			{
			err += "组织不存在；";

			HCusID = "0";
			tb2.Rows[i - 1]["客户内码"] = "0";
			}
			else
			{
			tb2.Rows[i - 1]["组织代码"] = ds.Tables[0].Rows[0]["HNumber"];
			tb2.Rows[i - 1]["组织名称"] = ds.Tables[0].Rows[0]["HName"];

			sql = "select c.* from " +
			"Gy_Customer as c " +
			"left join Xt_ORGANIZATIONS o on c.HUSEORGID = o.HItemID " +
			"where c.HNumber = '" + HCusNumber + "' " +
			"and o.HNumber = '" + ds.Tables[0].Rows[0]["HNumber"] + "' " +
			"and o.HName = '" + ds.Tables[0].Rows[0]["HName"] + "'";
			ds = oCN.RunProcReturn(sql, "Gy_Customer");
			if (ds.Tables[0].Rows.Count == 0)
			{
			err += "该组织下客户不存在；";
			HCusID = "0";
			tb2.Rows[i - 1]["客户内码"] = "0";
			}
			else
			{
			tb2.Rows[i - 1]["客户内码"] = ds.Tables[0].Rows[0]["HItemID"];
			tb2.Rows[i - 1]["客户代码"] = ds.Tables[0].Rows[0]["HNumber"];
			tb2.Rows[i - 1]["客户名称"] = ds.Tables[0].Rows[0]["HName"];

			HCusID = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			}

			//判定该用户与客户是否已经关联
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			{
			err += "用户已经关联该客户；";
			}

			tb2.Rows[i - 1]["判定结果"] = err;
			error += err;

			i++;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = (error.Length>0?"0":"1");
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 用户关联客户导入(保存)
			[Route("Xt_User/Gy_UserCustomer_ImportByExcel_Save")]
			[HttpPost]
			@@ -1880,6 +2056,7 @@
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			string saveType = sArray[2].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationCustomer_Edit", 1, false, user))
			@@ -1904,46 +2081,84 @@
			list.Add(dic);
			}

			oCN.BeginTran();
			string err = "";
			int i = 1;
			string sql = "";
			foreach (Dictionary<string, string> item in list)
			if(saveType == "1")
			{
			string HUserID = item["HUserID"].ToString();//供应商
			string HUserName = item["用户名称"].ToString();//物料ID
			string HCusID = item["HCusID"].ToString();//组织ID
			string HCusNumber = item["客户代码"].ToString();
			string HCusName = item["客户名称"].ToString();
			oCN.BeginTran();
			string err = "";
			int i = 1;
			string sql = "";
			foreach (Dictionary<string, string> item in list)
			{
			string HUserID = item["用户代码"].ToString();//供应商
			string HUserName = item["用户名称"].ToString();//物料ID
			string HCusID = item["客户内码"].ToString();//组织ID
			string HCusNumber = item["客户代码"].ToString();
			string HCusName = item["客户名称"].ToString();
			string HOrgNumber = item["组织代码"].ToString();
			string HOrgName = item["组织名称"].ToString();

			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			}
			else
			{

			}
			i++;
			}
			else
			{
			err += "第" + i + "行：用户已经关联该客户!";
			}
			i++;
			}
			//判断是否存在错误
			if (err.Length > 0)
			}else if(saveType == "2")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "导入错误："+ err;
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();
			string err = "";
			int i = 1;
			string sql = "";
			foreach (Dictionary<string, string> item in list)
			{
			string HUserID = item["用户代码"].ToString();//供应商
			string HUserName = item["用户名称"].ToString();//物料ID
			string HCusID = item["客户内码"].ToString();//组织ID
			string HCusNumber = item["客户代码"].ToString();
			string HCusName = item["客户名称"].ToString();
			string HOrgNumber = item["组织代码"].ToString();
			string HOrgName = item["组织名称"].ToString();

			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			}
			else
			{
			err += "第" + i + "行：用户已经关联该客户!";
			}
			i++;
			}
			//判断是否存在错误
			if (err.Length > 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "导入错误：" + err;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1963,7 +2178,6 @@
			}
			}
			#endregion


			#region 用户关联客户保存
			[Route("Xt_User/SaveUserCustomer")]