diff --git a/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql b/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql index 693e0aa6..595eeb71 100644 --- a/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql +++ b/DataBase/版本日志/SGGLDB_V2026-06-10-gf.sql @@ -1,4 +1,8 @@ +update Sys_Menu set Url='CQMS/PersonManage/WelderManage.aspx' where MenuId='1908E4C9-4A63-4A6C-6666-DA4910C2A8C7' +update Sys_Menu set SortIndex=11 where MenuId='1C6F9CA9-FDAC-4CE5-A19C-5536538851E1' +GO + ALTER VIEW [dbo].[View_SitePerson_Person] AS /*ֳԱͼ*/ diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index e6c42dc8..bb831001 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -843,6 +843,7 @@ namespace BLL IsSafetyMonitoring = person.IsSafetyMonitoring, WelderCode = person.WelderCode, IsCQMSCheck = person.IsCQMSCheck, + IsWeldAudit = true, }; if (newPerson.WorkPostId == Const.WorkPost_Welder) diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs index c3142d9e..4b17fc1b 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs @@ -1141,6 +1141,7 @@ namespace FineUIPro.Web.HSSE.SitePerson newPerson.OutResult = persons[i].OutResult; newPerson.States = BLL.Const.State_1; newPerson.WelderCode = persons[i].WelderCode; + newPerson.IsWeldAudit = true; //newPerson.IsForeign = persons[i].IsForeign; //newPerson.IsOutside = persons[i].IsOutside; //newPerson.IsUsed = persons[i].IsUsedName == "是" ? true : false; diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index ecd49324..a01be0df 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -7,22 +7,19 @@ - - - + + - - + - - - + + @@ -35,7 +32,7 @@ - + @@ -44,7 +41,6 @@ -