From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 213 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 08c0326..3ec6fa1 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;
@@ -107,6 +108,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 +221,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,HCheckEmpID) " +
+ ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber,HDingDingUserID) " +
"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].HCheckEmpID.ToString() + ")");
+ ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "','" + lsmain[0].HDingDingUserID + "'" + ")");
//鏂板鍚庢煡璇� 纭繚鏁版嵁娣诲姞鎴愬姛
ds = oCN.RunProcReturn("Select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -239,6 +271,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) //淇敼瀵嗙爜
{
@@ -264,10 +307,13 @@
",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 + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
else
@@ -293,10 +339,13 @@
",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 + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
@@ -1548,6 +1597,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]
--
Gitblit v1.9.1