MES-WEB-API.git

			@@ -728,6 +728,316 @@
			}
			#endregion

			#region 用户关联组织维护列表
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Xt_User/UserRelationOrganizationList")]
			[HttpGet]
			public object UserRelationOrganizationList(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无查看权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = "";


			if (sWhere == null \|\| sWhere.Equals(""))
			{
			sql = "select * from h_v_Gy_UserOrganizationRelationList_Query order by 用户代码 asc,组织代码 asc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_UserOrganizationRelationList_Query");
			}
			else
			{
			sql = "select * from h_v_Gy_UserOrganizationRelationList_Query where 1=1 ";
			sql = sql + sWhere + " order by 用户代码 asc,组织代码 asc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_UserOrganizationRelationList_Query");
			}

			//添加列名
			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)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 用户关联组织维护删除
			/// <summary>
			///参数：string HInterID。
			///返回值：object。
			/// </summary>
			[Route("Xt_User/UserRelationOrganizationlist_Drop")]
			[HttpGet]
			public object UserRelationOrganizationlist_Drop(string HInterID, string user)
			{
			try
			{
			string s = "";

			//查看权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Drop", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			if (HInterID == null \|\| HInterID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();

			string sql = "delete from Gy_UserORGRelation where HItemID = " + HInterID;
			oCN.RunProc(sql);

			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 用户关联组织维护编辑初始化
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Xt_User/UserRelationOrganizationList_EditInit")]
			[HttpGet]
			public object UserRelationOrganizationList_EditInit(int HItemID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无查看权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = "select * from h_v_Gy_UserOrganizationRelationList_Query where HItemID = " + HItemID;
			ds = oCN.RunProcReturn(sql, "h_v_Gy_UserOrganizationRelationList_Query");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 用户关联组织维护保存
			[Route("Xt_User/UserRelationOrganizationList_Save")]
			[HttpPost]
			public object UserRelationOrganizationList_Save([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 saveType = sArray[2].ToString();
			try
			{
			//if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationOrganization_Edit", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无保存权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			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);
			}

			if (saveType == "1")
			{
			oCN.BeginTran();
			string err = "";
			int i = 1;
			string sql = "";
			foreach (Dictionary<string, string> item in list)
			{
			string HItemID = item["HItemID"].ToString(); //
			string HUserID = item["HUserID"].ToString(); //用户代码
			string HUserName = item["HUserName"].ToString(); //用户名称
			string HOrgID = item["HOrgID"].ToString(); //组织内码
			string HOrgNumber = item["HOrgNumber"].ToString(); //组织代码
			string HOrgName = item["HOrgName"].ToString(); //组织名称


			sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID;
			ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserORGRelation(HUserID,HOrgID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HOrgID + "" +
			")";
			oCN.RunProc(sql);
			}
			else
			{
			err += "第" + i + "行：用户【" + HUserName + "】已经关联组织【" + HOrgName + "】";
			}
			i++;
			}
			//判断是否存在错误
			if (err.Length > 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败：" + err;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else if (saveType == "3")
			{
			oCN.BeginTran();
			string err = "";
			int i = 1;
			string sql = "";
			foreach (Dictionary<string, string> item in list)
			{
			string HItemID = item["HItemID"].ToString(); //
			string HUserID = item["HUserID"].ToString(); //用户代码
			string HUserName = item["HUserName"].ToString(); //用户名称
			string HOrgID = item["HOrgID"].ToString(); //组织内码
			string HOrgNumber = item["HOrgNumber"].ToString(); //组织代码
			string HOrgName = item["HOrgName"].ToString(); //组织名称

			sql = "select * from Gy_UserORGRelation where HItemID = " + HItemID;
			ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
			if (ds.Tables[0].Rows.Count > 0)
			{
			sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID + " and HItemID <> " + HItemID;
			ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "update Gy_UserORGRelation set " +
			"HUserID = '" + HUserID + "' " +
			",HOrgID = " + HOrgID + " " +
			"where HItemID = " + HItemID;
			oCN.RunProc(sql);
			}
			else
			{
			err += "第" + i + "行：用户【" + HUserName + "】已经关联组织【" + HOrgName + "】";
			}
			}
			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;
			objJsonResult.Message = "保存成功!";
			objJsonResult.data = null;
			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/UserStocklistPlaylist")]
			[HttpGet]
			@@ -2908,12 +3218,26 @@
			}
			}

			//判定该用户与客户是否已经关联
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			//判定客户是否已经关联用户
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HUserID"].ToString()!= HUserID)
			{
			err += "用户已经关联该客户；";
			err += "用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】；";
			}
			else
			{
			//判定该用户与客户是否已经关联
			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;
			@@ -2995,12 +3319,26 @@
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.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);
			oCN.RunProc(sql);
			}
			else
			{
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			i++;
			}
			else
			{
			@@ -3008,7 +3346,18 @@
			}
			i++;
			}
			}else if(saveType == "2")
			//判断是否存在错误
			if (err.Length > 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "导入错误：" + err;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else if(saveType == "2")
			{
			oCN.BeginTran();
			string err = "";
			@@ -3024,20 +3373,34 @@
			string HOrgNumber = item["组织代码"].ToString();
			string HOrgName = item["组织名称"].ToString();

			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;

			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HUserID"].ToString()!=HUserID)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			else
			{
			err += "第" + i + "行：用户已经关联该客户!";
			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++;
			}
			@@ -3284,7 +3647,11 @@
			string HCusName = item["HCusName"].ToString(); //客户名称


			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			@@ -3297,7 +3664,7 @@
			}
			else
			{
			err += "第" + i + "行：用户【" + HUserName + "】已经关联客户【" + HCusName + "】";
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			i++;
			}
			@@ -3331,7 +3698,11 @@
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			{
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID + " and HItemID <> " + HItemID;
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID + " and a.HItemID <> " + HItemID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if(ds.Tables[0].Rows.Count == 0)
			{
			@@ -3343,7 +3714,7 @@
			}
			else
			{
			err += "第" + i + "行：用户【" + HUserName + "】已经关联客户【" + HCusName + "】";
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			}
			else