lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2026-04-08 17:21:11 +08:00
parent fc5528538f
commit 9c2e72506b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/Common/Const.cs
View File

@ -375,6 +375,11 @@ namespace BLL
/// </summary>
public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder2 = "2121c01d-b0ef-487c-ac26-1b18109daf05";
/// <summary>
/// 无损检测工岗位Id
/// </summary>

2
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
View File

@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
rootNode.Text = item.UnitName;
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId select x).ToList();
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && (x.WorkPostId == Const.WorkPost_Welder || x.WorkPostId == Const.WorkPost_Welder2) && x.UnitId == item.UnitId select x).ToList();
if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
{
getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -17019,7 +17019,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>