From 4b2a2f346b1467bc0de90e2e87a33b8ede2a8a72 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 29 七月 2025 12:54:22 +0800
Subject: [PATCH] 1.页面过滤条件：开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图 3.饼状图 4.根据仓库、物料，维护物料的价格 2.根据表结构增加维护页面、列表页面
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 263 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index bfdcfd2..5ff4933 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,HWorkCenterID,HICNumber) " +
+ ",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].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "'" + ")");
+ ","+ 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 +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) //淇敼瀵嗙爜
{
@@ -270,6 +313,8 @@
",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
@@ -300,7 +345,9 @@
",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
- ",HICNumber='" + lsmain[0].HICNumber + "'" +
+ ",HICNumber='" + lsmain[0].HICNumber + "'" +
+ ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
+ ",HCusID='" + lsmain[0].HCusID + "'" +
" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
@@ -335,8 +382,6 @@
}
}
#endregion
-
-
#region 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶄緵搴斿晢鍒楄〃
[Route("Xt_User/SupperPlaylist")]
@@ -796,6 +841,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 鍒犻櫎
/// <summary>
///鍙傛暟锛歴tring HInterID銆�
@@ -830,7 +876,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();
@@ -851,6 +897,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 缂栬緫鍒濆鍖�
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -893,6 +940,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈缁勭粐缁存姢 淇濆瓨
[Route("Xt_User/UserRelationOrganizationList_Save")]
[HttpPost]
@@ -944,11 +992,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 + "" +
@@ -987,15 +1035,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;
@@ -1547,6 +1595,168 @@
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #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;
}
}
@@ -2259,6 +2469,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 鍒犻櫎
/// <summary>
///鍙傛暟锛歴tring HInterID銆�
@@ -2314,6 +2525,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 缂栬緫鍒濆鍖�
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -2356,6 +2568,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈鑱屽憳缁存姢 淇濆瓨
[Route("Xt_User/UserRelationEmployeelist_Save")]
[HttpPost]
@@ -2820,6 +3033,7 @@
}
}
#endregion
+
#region 鏌ヨ鎸囧畾鐢ㄦ埛鎵�鍏宠仈瀹㈡埛涓殑瀹㈡埛
[Route("Xt_User/CustomerPlaylistFromUserCustomerList")]
[HttpGet]
@@ -2873,6 +3087,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛淇濆瓨
[Route("Xt_User/SaveUserCustomer")]
[HttpPost]
@@ -2929,6 +3144,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛 鏂囦欢涓婁紶
[Route("Xt_User/Gy_UserCustomer_ImportByExcel")]
@@ -3090,6 +3306,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛 瀵煎叆(鏁版嵁楠岃瘉)
[Route("Xt_User/Gy_UserCustomer_ImportByExcel_Confirm")]
[HttpPost]
@@ -3270,6 +3487,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛 瀵煎叆(淇濆瓨)
[Route("Xt_User/Gy_UserCustomer_ImportByExcel_Save")]
[HttpPost]
@@ -3560,6 +3778,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 缂栬緫鍒濆鍖�
/// <summary>
///鍙傛暟锛歴tring sql銆�
@@ -3602,6 +3821,7 @@
}
}
#endregion
+
#region 鐢ㄦ埛鍏宠仈瀹㈡埛缁存姢 淇濆瓨
[Route("Xt_User/UserRelationCustomerlist_Save")]
[HttpPost]
@@ -3760,6 +3980,7 @@
}
}
#endregion
+
#region 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶅伐搴忓垪琛�
[Route("Xt_User/ProcessPlaylist")]
@@ -4303,5 +4524,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