From 6610c21cc50c942e280d98f1787605265f5adb2c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 23 五月 2024 10:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 1134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,111 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 1ee4d5b..bfdcfd2 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -206,14 +206,14 @@
",HWhID,HWHName,HSupID,HSupName " +
",HSCWHID,HSCWHName " +
",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
- ",HGroupID,HSourceID) " +
+ ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber) " +
"values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
"," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
"," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
"," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" +
",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + "," + lsmain[0].HProcID.ToString() + "" +
- ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + ")");
+ ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "'" + ")");
//鏂板鍚庢煡璇� 纭繚鏁版嵁娣诲姞鎴愬姛
ds = oCN.RunProcReturn("Select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -256,6 +256,7 @@
",HDeptID=" + lsmain[0].HDeptID.ToString() +
",HDept='" + lsmain[0].HDept.ToString() + "'" +
",HWhID=" + lsmain[0].HWhID.ToString() +
+ ",HCheckEmpID=" + lsmain[0].HCheckEmpID.ToString() +
",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
",HSCWHName='" + lsmain[0].HSCWHName.ToString() + "'" +
@@ -263,10 +264,12 @@
",HProcID=" + lsmain[0].HProcID.ToString() +
",HSourceID=" + lsmain[0].HSourceID.ToString() +
",HGroupID=" + lsmain[0].HGroupID.ToString() +
+ ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
+ ",HICNumber='" + lsmain[0].HICNumber + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
else
@@ -283,6 +286,7 @@
",HSellMan='" + lsmain[0].HSellMan.ToString() + "'" +
",HDeptID=" + lsmain[0].HDeptID.ToString() +
",HDept='" + lsmain[0].HDept.ToString() + "'" +
+ ",HCheckEmpID=" + lsmain[0].HCheckEmpID.ToString() +
",HWhID=" + lsmain[0].HWhID.ToString() +
",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
@@ -291,10 +295,12 @@
",HProcID=" + lsmain[0].HProcID.ToString() +
",HSourceID=" + lsmain[0].HSourceID.ToString() +
",HGroupID=" + lsmain[0].HGroupID.ToString() +
+ ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
+ ",HICNumber='" + lsmain[0].HICNumber + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
@@ -681,7 +687,7 @@
return objJsonResult;
}
}
- #endregion
+ #endregion
#region 鐢ㄦ埛鍏宠仈缁勭粐淇濆瓨
[Route("Xt_User/SaveUserByOrg")]
@@ -723,6 +729,316 @@
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring 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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ 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>
+ ///鍙傛暟锛歴tring 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>
+ ///鍙傛暟锛歴tring 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;
}
}
@@ -990,6 +1306,69 @@
}
#endregion
+ #region 鐢ㄦ埛鍏宠仈鐝粍缁存姢鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/Gy_UserGroupRelationList")]
+ [HttpGet]
+ public object Gy_UserGroupRelationList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_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_UserGroupRelationList_Query order by 鐢ㄦ埛浠ｇ爜 asc,鐝粍浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserGroupRelationList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_UserGroupRelationList_Query where 1=1 ";
+ sql = sql + sWhere + " order by 鐢ㄦ埛浠ｇ爜 asc,鐝粍浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserGroupRelationList_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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ 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/SaveUserGroup")]
[HttpPost]
@@ -1030,6 +1409,62 @@
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢ㄦ埛鍏宠仈鐝粍缁存姢 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserGroupRelationList_Drop")]
+ [HttpGet]
+ public object UserGroupRelationList_Drop(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Delete", 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_UserGroupRelation 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;
}
}
@@ -1236,6 +1671,69 @@
}
#endregion
+ #region 鐢ㄦ埛鍏宠仈宸ヤ綅缁存姢鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserByWorkStationRelationList")]
+ [HttpGet]
+ public object UserByWorkStationRelationList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserWorkStationList_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_UserByWorkStationRelationList_Query order by 鐢ㄦ埛浠ｇ爜 asc,宸ヤ綅浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserByWorkStationRelationList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_UserByWorkStationRelationList_Query where 1=1 ";
+ sql = sql + sWhere + " order by 鐢ㄦ埛浠ｇ爜 asc,宸ヤ綅浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserByWorkStationRelationList_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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ 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/SaveUserByWorkStation")]
[HttpPost]
@@ -1276,6 +1774,105 @@
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢ㄦ埛鍏宠仈宸ヤ綅缁存姢 缂栬緫鍒濆鍖�
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserByWorkStationRelationList_EditInit")]
+ [HttpGet]
+ public object UserByWorkStationRelationList_EditInit(int HItemID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserWorkStationList_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_Gy_UserByWorkStationRelationList_Query where 鐢ㄦ埛浠ｇ爜 = '" + HItemID + "'";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserByWorkStationRelationList_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 鐢ㄦ埛鍏宠仈宸ヤ綅缁存姢 鍒犻櫎
+ /// <summary>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserByWorkStationRelationList_Drop")]
+ [HttpGet]
+ public object UserByWorkStationRelationList_Drop(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserWorkStationList_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_UserByWorkStationRelation 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;
}
}
@@ -1591,6 +2188,316 @@
catch (Exception e)
{
LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserRelationEmployeelist")]
+ [HttpGet]
+ public object UserRelationEmployeelist(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_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_UserEmployeeRelationList_Query order by 鐢ㄦ埛浠ｇ爜 asc,鑱屽憳浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserEmployeeRelationList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_UserEmployeeRelationList_Query where 1=1 ";
+ sql = sql + sWhere + " order by 鐢ㄦ埛浠ｇ爜 asc,鑱屽憳浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserEmployeeRelationList_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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ 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>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserRelationEmployeelist_Drop")]
+ [HttpGet]
+ public object UserRelationEmployeelist_Drop(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_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_UserEmployeeRelation 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>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserRelationEmployeelist_EditInit")]
+ [HttpGet]
+ public object UserRelationEmployeelist_EditInit(int HItemID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationEmployee_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ string sql = "select * from h_v_Gy_UserEmployeeRelationList_Query where HItemID = " + HItemID;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserEmployeeRelationList_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/UserRelationEmployeelist_Save")]
+ [HttpPost]
+ public object UserRelationEmployeelist_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_UserRelationEmployee_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 HEmpID = item["HEmpID"].ToString(); //瀹㈡埛鍐呯爜
+ string HEmpNumber = item["HEmpNumber"].ToString(); //瀹㈡埛浠ｇ爜
+ string HEmpName = item["HEmpName"].ToString(); //瀹㈡埛鍚嶇О
+
+
+ sql = "select * from Gy_UserEmployeeRelation where HUserID = '" + HUserID + "' and HEmployeeID = " + HEmpID;
+ ds = oCN.RunProcReturn(sql, "Gy_UserEmployeeRelation");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ sql = "insert into Gy_UserEmployeeRelation(HUserID,HEmployeeID)" +
+ "values(" +
+ "'" + HUserID + "'" +
+ "," + HEmpID + "" +
+ ")";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱旇亴鍛樸��" + HEmpName + "銆�";
+ }
+ 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 HEmpID = item["HEmpID"].ToString(); //鑱屽憳鍐呯爜
+ string HEmpNumber = item["HEmpNumber"].ToString(); //鑱屽憳浠ｇ爜
+ string HEmpName = item["HEmpName"].ToString(); //鑱屽憳鍚嶇О
+
+ sql = "select * from Gy_UserEmployeeRelation where HItemID = " + HItemID;
+ ds = oCN.RunProcReturn(sql, "Gy_UserEmployeeRelation");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ sql = "select * from Gy_UserEmployeeRelation where HUserID = '" + HUserID + "' and HEmployeeID = " + HEmpID + " and HItemID <> " + HItemID;
+ ds = oCN.RunProcReturn(sql, "Gy_UserEmployeeRelation");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ sql = "update Gy_UserEmployeeRelation set " +
+ "HUserID = '" + HUserID + "' " +
+ ",HEmployeeID = " + HEmpID + " " +
+ "where HItemID = " + HItemID;
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱旇亴鍛樸��" + HEmpName + "銆�";
+ }
+ }
+ 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();
@@ -2317,12 +3224,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;
@@ -2404,12 +3325,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
{
@@ -2417,7 +3352,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 = "";
@@ -2433,20 +3379,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++;
}
@@ -2544,6 +3504,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 鍒犻櫎
/// <summary>
///鍙傛暟锛歴tring HInterID銆�
@@ -2692,7 +3653,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)
{
@@ -2705,7 +3670,7 @@
}
else
{
- err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱斿鎴枫��" + HCusName + "銆�";
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
}
i++;
}
@@ -2739,7 +3704,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)
{
@@ -2751,7 +3720,7 @@
}
else
{
- err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱斿鎴枫��" + HCusName + "銆�";
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
}
}
else
@@ -3215,5 +4184,124 @@
}
}
#endregion
+
+ #region 鐢ㄦ埛鍏宠仈渚涘簲鍟嗙淮鎶ゅ垪琛�
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/Gy_UserSupplierRelationList")]
+ [HttpGet]
+ public object Gy_UserSupplierRelationList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserSupplierRelationList", 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_UserSupplierRelationList_Query order by 鐢ㄦ埛浠ｇ爜 asc,渚涘簲鍟嗕唬鐮� asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserSupplierRelationList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_UserSupplierRelationList_Query where 1=1 ";
+ sql = sql + sWhere + " order by 鐢ㄦ埛浠ｇ爜 asc,渚涘簲鍟嗕唬鐮� asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserSupplierRelationList_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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ 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>
+ ///鍙傛暟锛歴tring HInterID銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserSupplierRelationList_Drop")]
+ [HttpGet]
+ public object UserSupplierRelationList_Drop(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserSupplierRelation_Delete", 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_UserSupplierRelation 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1