From 99bcfefdb20187000fc89a8f2654745ad2f0e371 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 12 五月 2026 15:39:09 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 401 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 367 insertions(+), 34 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 4c60ad0..84363dd 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -1,6 +1,7 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -11,6 +12,8 @@
using System.Web.Http;
using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
+using WebAPI.Utility;
+
namespace WebAPI.Controllers
{
public class Xt_UserController : ApiController
@@ -25,6 +28,7 @@
#region[鐢ㄦ埛鍒楄〃鏌ヨ]
[Route("Xt_User/list")]
[HttpGet]
+ [Permission(HModName = "Xt_User_Query")]
public object list(string sWhere,string user)
{
try
@@ -107,6 +111,26 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ ////鑾峰彇褰撳墠鐢ㄦ埛韬唤鍒楄〃
+ //string sql = "select HLev from System_UserGroupInfo u " +
+ // " left join System_UserGroup r " +
+ // "on u.GroupId = r.GroupID where u.UserId = '" + HCzybm + "'";
+
+ ////鐢ㄦ埛韬唤鍒ゆ柇
+ //DataSet hLev = oCN.RunProcReturn(sql, "System_UserGroupInfo");
+ //foreach(DataRow dr in hLev.Tables[0].Rows)
+ //{
+ // if (!dr["HLev"].Equals(RoleConstant.EMPLOYEE))
+ // {
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "绠＄悊鍛樿韩浠戒笉鍏佽鍒犻櫎锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
oCN.BeginTran();
//鍒犻櫎鐢ㄦ埛淇℃伅
oCN.RunProc("delete from Gy_Czygl where Czybm='" + HCzybm + "'");
@@ -200,20 +224,31 @@
return objJsonResult;
}
+ //鍒ゆ柇鐢ㄦ埛鏁版槸鍚﹀ぇ浜庡鎴疯处鍙锋暟
+ ds = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain,HempID,HK3UserID " +
",HKeeperID,HKeeper,HSecManagerID,HSecManager " +
",HSellManID,HSellMan,HDeptID,HDept " +
",HWhID,HWHName,HSupID,HSupName " +
",HSCWHID,HSCWHName " +
",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
- ",HGroupID,HSourceID) " +
+ ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber,HDingDingUserID,HCusID) " +
"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 + "','" + lsmain[0].HDingDingUserID + "','" + lsmain[0].HCusID + "'" + ")");
//鏂板鍚庢煡璇� 纭繚鏁版嵁娣诲姞鎴愬姛
ds = oCN.RunProcReturn("Select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -239,6 +274,17 @@
}
else //淇敼
{
+ //鍒ゆ柇鐢ㄦ埛鏁版槸鍚﹀ぇ浜庡鎴疯处鍙锋暟
+ ds = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
if (ds.Tables[0].Rows[0]["Czmm"].ToString() != lsmain[0].Czmm) //淇敼瀵嗙爜
{
@@ -256,6 +302,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 +310,14 @@
",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 + "'" +
+ ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
+ ",HCusID='" + lsmain[0].HCusID + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
else
@@ -283,6 +334,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 +343,14 @@
",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 + "'" +
+ ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
+ ",HCusID='" + lsmain[0].HCusID + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
@@ -313,7 +369,6 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
@@ -329,8 +384,6 @@
}
}
#endregion
-
-
#region 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶄緵搴斿晢鍒楄〃
[Route("Xt_User/SupperPlaylist")]
@@ -790,6 +843,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 鍒犻櫎
/// <summary>
///鍙傛暟锛歴tring HInterID銆�
@@ -824,7 +878,7 @@
oCN.BeginTran();
- string sql = "delete from Gy_UserORGRelation where HItemID = " + HInterID;
+ string sql = "delete from Gy_UserByOrgRelation where HItemID = " + HInterID;
oCN.RunProc(sql);
oCN.Commit();
@@ -845,6 +899,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 缂栬緫鍒濆鍖�
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -887,6 +942,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 淇濆瓨
[Route("Xt_User/UserRelationOrganizationList_Save")]
[HttpPost]
@@ -938,11 +994,11 @@
string HOrgName = item["HOrgName"].ToString(); //缁勭粐鍚嶇О
- sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID;
- ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
+ sql = "select * from Gy_UserByOrgRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID;
+ ds = oCN.RunProcReturn(sql, "Gy_UserByOrgRelation");
if (ds.Tables[0].Rows.Count == 0)
{
- sql = "insert into Gy_UserORGRelation(HUserID,HOrgID)" +
+ sql = "insert into Gy_UserByOrgRelation(HUserID,HOrgID)" +
"values(" +
"'" + HUserID + "'" +
"," + HOrgID + "" +
@@ -981,15 +1037,15 @@
string HOrgNumber = item["HOrgNumber"].ToString(); //缁勭粐浠ｇ爜
string HOrgName = item["HOrgName"].ToString(); //缁勭粐鍚嶇О
- sql = "select * from Gy_UserORGRelation where HItemID = " + HItemID;
- ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
+ sql = "select * from Gy_UserByOrgRelation where HItemID = " + HItemID;
+ ds = oCN.RunProcReturn(sql, "Gy_UserByOrgRelation");
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");
+ sql = "select * from Gy_UserByOrgRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID + " and HItemID <> " + HItemID;
+ ds = oCN.RunProcReturn(sql, "Gy_UserByOrgRelation");
if (ds.Tables[0].Rows.Count == 0)
{
- sql = "update Gy_UserORGRelation set " +
+ sql = "update Gy_UserByOrgRelation set " +
"HUserID = '" + HUserID + "' " +
",HOrgID = " + HOrgID + " " +
"where HItemID = " + HItemID;
@@ -1078,6 +1134,7 @@
#region 鐢ㄦ埛鍏宠仈浠撳簱鍒楄〃鏌ヨ
[Route("Xt_User/Gy_UserStockRelationList")]
[HttpGet]
+ [Permission(HModName = "Gy_UserStockRelation_Query")]
public object Gy_UserStockRelationList(string sWhere, string user)
{
try
@@ -1131,6 +1188,7 @@
/// </summary>
[Route("Xt_User/Gy_UserStockRelationDrop")]
[HttpGet]
+ [Permission(HModName = "Gy_UserStockRelation_Drop")]
public object Gy_UserStockRelationDrop(string HItemID, string user)
{
try
@@ -1227,6 +1285,7 @@
#region 鐢ㄦ埛鍏宠仈鐢ㄦ埛鍒楄〃鏌ヨ
[Route("Xt_User/Gy_UserByUserList")]
[HttpGet]
+ [Permission(HModName = "Gy_UserByUser_Query")]
public object Gy_UserByUserList(string sWhere, string user)
{
try
@@ -1546,6 +1605,168 @@
}
#endregion
+ #region 鐢ㄦ埛鍏宠仈閮ㄩ棬鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserRelationDeptlist")]
+ [HttpGet]
+ public object UserRelationDeptlist(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_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_UserDeptRelationList_Query order by 鐢ㄦ埛浠ｇ爜 asc,閮ㄩ棬浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
+ }
+ else
+ {
+ sql = "select * from h_v_Gy_UserDeptRelationList_Query where 1=1 ";
+ sql = sql + sWhere + " order by 鐢ㄦ埛浠ｇ爜 asc,閮ㄩ棬浠ｇ爜 asc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_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 鐢ㄦ埛鍏宠仈閮ㄩ棬 鏍规嵁鐢ㄦ埛ID鏌ユ壘
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_User/UserRelationDeptlist_EditInit")]
+ [HttpGet]
+ public object UserRelationDeptlist_EditInit(int HItemID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_Gy_UserDeptRelationList_Query where HItemID = " + HItemID;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_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/UserRelationDeptlist_Drop")]
+ [HttpGet]
+ public object UserRelationDeptlist_Drop(string HInterID, string user)
+ {
+ try
+ {
+ string s = "";
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_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_UserDeptRelation 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 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶅伐浣滀腑蹇冨垪琛�
[Route("Xt_User/UserWorkCenterlistPlaylist")]
[HttpGet]
@@ -1672,6 +1893,7 @@
/// </summary>
[Route("Xt_User/UserByWorkStationRelationList")]
[HttpGet]
+ [Permission(HModName = "Gy_UserWorkStationList_Query")]
public object UserByWorkStationRelationList(string sWhere, string user)
{
try
@@ -1731,6 +1953,7 @@
#region 鐢ㄦ埛鍏宠仈宸ヤ綅淇濆瓨
[Route("Xt_User/SaveUserByWorkStation")]
[HttpPost]
+ [Permission(HModName = "Gy_UserWorkStationList_Edit")]
public object SaveUserByWorkStation([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
@@ -1823,6 +2046,7 @@
/// </summary>
[Route("Xt_User/UserByWorkStationRelationList_Drop")]
[HttpGet]
+ [Permission(HModName = "Gy_UserWorkStationList_Drop")]
public object UserByWorkStationRelationList_Drop(string HInterID, string user)
{
try
@@ -2253,6 +2477,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 鍒犻櫎
/// <summary>
///鍙傛暟锛歴tring HInterID銆�
@@ -2308,6 +2533,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 缂栬緫鍒濆鍖�
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -2350,6 +2576,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 淇濆瓨
[Route("Xt_User/UserRelationEmployeelist_Save")]
[HttpPost]
@@ -2541,6 +2768,7 @@
#region 鐢ㄦ埛鍏宠仈鐢ㄦ埛淇濆瓨
[Route("Xt_User/SaveUserUser")]
[HttpPost]
+ [Permission(HModName = "Gy_UserByUser_Edit")]
public object SaveUserUser([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
@@ -2624,6 +2852,7 @@
#region 鐢ㄦ埛鍏宠仈鐗╂枡鍒楄〃鏌ヨ
[Route("Xt_User/Gy_UserMaterList")]
[HttpGet]
+ [Permission(HModName = "Gy_UserMaterList_Query")]
public object Gy_UserMaterList(string sWhere, string user)
{
try
@@ -2677,6 +2906,7 @@
/// </summary>
[Route("Xt_User/Gy_UserMaterRelationDrop")]
[HttpGet]
+ [Permission(HModName = "Gy_UserMaterList_Drop")]
public object Gy_UserMaterRelationDrop(string HItemID, string user)
{
try
@@ -2773,6 +3003,7 @@
#region 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶅鎴峰垪琛�
[Route("Xt_User/CustomerPlaylist")]
[HttpGet]
+ [Permission(HModName = "Gy_UserRelationCustomer", Operate = "_Query")]
public object CustomerPlaylist(string HUserID, string CurUserName)
{
try
@@ -2814,9 +3045,11 @@
}
}
#endregion
+
#region 鏌ヨ鎸囧畾鐢ㄦ埛鎵�鍏宠仈瀹㈡埛涓殑瀹㈡埛
[Route("Xt_User/CustomerPlaylistFromUserCustomerList")]
[HttpGet]
+ [Permission(HModName = "Gy_UserRelationCustomer", Operate = "_Query")]
public object CustomerPlaylistFromUserCustomerList(string HUserID, string HCusNumber, string HCusName, string CurUserName)
{
try
@@ -2867,9 +3100,11 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛淇濆瓨
[Route("Xt_User/SaveUserCustomer")]
[HttpPost]
+ [Permission(HModName = "Gy_UserRelationCustomer", Operate = "_Edit")]
public object SaveUserCustomer([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
@@ -2923,6 +3158,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛 鏂囦欢涓婁紶
[Route("Xt_User/Gy_UserCustomer_ImportByExcel")]
@@ -3084,6 +3320,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛 瀵煎叆(鏁版嵁楠岃瘉)
[Route("Xt_User/Gy_UserCustomer_ImportByExcel_Confirm")]
[HttpPost]
@@ -3218,12 +3455,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;
@@ -3250,6 +3501,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛 瀵煎叆(淇濆瓨)
[Route("Xt_User/Gy_UserCustomer_ImportByExcel_Save")]
[HttpPost]
@@ -3305,12 +3557,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
{
@@ -3318,7 +3584,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 = "";
@@ -3334,20 +3611,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++;
}
@@ -3501,6 +3792,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 缂栬緫鍒濆鍖�
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -3543,6 +3835,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 淇濆瓨
[Route("Xt_User/UserRelationCustomerlist_Save")]
[HttpPost]
@@ -3594,7 +3887,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)
{
@@ -3607,7 +3904,7 @@
}
else
{
- err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱斿鎴枫��" + HCusName + "銆�";
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
}
i++;
}
@@ -3641,7 +3938,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)
{
@@ -3653,7 +3954,7 @@
}
else
{
- err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱斿鎴枫��" + HCusName + "銆�";
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
}
}
else
@@ -3693,6 +3994,7 @@
}
}
#endregion
+
#region 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶅伐搴忓垪琛�
[Route("Xt_User/ProcessPlaylist")]
@@ -4017,6 +4319,7 @@
#region 鐢ㄦ埛鍏宠仈宸ュ簭鍒楄〃鏌ヨ
[Route("Xt_User/UserProcesslist")]
[HttpGet]
+ [Permission(HModName = "Gy_UserMaterList_Query")]
public object UserProcesslist(string sWhere, string user)
{
try
@@ -4070,6 +4373,7 @@
/// </summary>
[Route("Xt_User/Gy_UserProcessDrop")]
[HttpGet]
+ [Permission(HModName = "Gy_UserProcessList_Drop")]
public object Gy_UserProcessDrop(string HItemID, string user)
{
try
@@ -4188,6 +4492,7 @@
/// </summary>
[Route("Xt_User/UserSupplierRelationList_Drop")]
[HttpGet]
+ [Permission(HModName = "Gy_UserSupplierRelation_Delete")]
public object UserSupplierRelationList_Drop(string HInterID, string user)
{
try
@@ -4236,5 +4541,33 @@
}
}
#endregion
+
+ #region 鏍规嵁鐢ㄦ埛鍏宠仈缁勭粐 杩囨护鏉′欢
+ [Route("Xt_User/getOrgIDListByUser")]
+ [HttpGet]
+ public object getOrgIDListByUser(string UserID, string UserName,string HOrgID)
+ {
+ try
+ {
+
+ //鏍规嵁鐢ㄦ埛ID 鏌ヨ鐢ㄦ埛鍏宠仈缁勭粐琛�
+ ds = oCN.RunProcReturn("exec h_p_GetHorgIDByUser_Query '"+ UserID + "','"+ UserName + "','"+ HOrgID + "'", "h_p_GetHorgIDByUser_Query");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ 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