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

20230308派遣方法优化

This commit is contained in:
杨红卫 2023-03-08 11:23:40 +08:00
parent a3c6b69133
commit 6462172f43
9 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
View File

@ -194,11 +194,12 @@ namespace BLL
newitem.IdentityCard = getPerson.IdentityCard;
if (!getPerson.MultiProject.HasValue || getPerson.MultiProject == false)
{
var getdate = newitem.InTime.HasValue ? newitem.InTime.Value.AddDays(-1) : DateTime.Now;
///未离场项目 先离场
OutPersonItem(newitem.PersonId, null, DateTime.Now);
OutPersonItem(newitem.PersonId, null, getdate);
}
var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId
var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId && x.ProjectId == newitem.ProjectId
&& x.InTime <= newitem.InTime && (x.OutTime > newitem.InTime || !x.OutTime.HasValue));
if (getPersonItem != null)
{

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

@ -12857,7 +12857,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:2087/</IISUrl>
<IISUrl>http://localhost:7022/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

13
SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
View File

@ -324,17 +324,12 @@ namespace FineUIPro.Web.Person
if (getPerson != null && getPerson.IsPost == true)
{
var getcuuProject = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == getPerson.IdentityCard && x.States == Const.ProjectPersonStates_1);
if (getcuuProject == null || getPerson.MultiProject == true)
if (getcuuProject != null && (getPerson.MultiProject == false|| !getPerson.MultiProject.HasValue))
{
////人员直接派遣时候
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonEdit.aspx?PersonId={0}&Type=P", Grid1.SelectedRowID, "查看 - ")));
}
else
{
var getProjectName = ProjectService.GetProjectNameByProjectId(getcuuProject.ProjectId) ?? "";
Alert.ShowInParent("当前人员已在项目："+getProjectName+"任职，请选择不在项目的人员派遣！", MessageBoxIcon.Warning);
return;
SitePerson_PersonService.SetSitePerson_PersonStates(getcuuProject.SitePersonId, Const.ProjectPersonStates_2, DateTime.Now);
}
////人员直接派遣时候
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonEdit.aspx?PersonId={0}&Type=P", Grid1.SelectedRowID, "查看 - ")));
}
else
{

1
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
View File

@ -50,6 +50,7 @@
<TreeNode id="F54EABD2-4242-4A5D-9154-680E02E9F466" Text="质量样板管理" NavigateUrl=""><TreeNode id="B44EC915-7854-4F06-8C87-CD5FF41E3AC0" Text="质量样板" NavigateUrl="CQMS/Models/QualityModel.aspx"></TreeNode>
</TreeNode>
<TreeNode id="C91C8319-0BFC-4585-BE14-ED41D45A160D" Text="质量月报" NavigateUrl=""><TreeNode id="786864C0-2875-49CD-B55E-0B5C8253295D" Text="质量月报" NavigateUrl="CQMS/Check/CheckMonth.aspx"></TreeNode>
<TreeNode id="B2086D3A-2384-487E-AFFB-6FACDD09B621" Text="质量数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx"></TreeNode>
</TreeNode>
<TreeNode id="390A78F0-43B2-4AF1-81B9-7C216FA7E0A4" Text="文件柜" NavigateUrl=""><TreeNode id="CF33572A-E875-4492-92BF-6EA265909A6C" Text="质量共检通知单" NavigateUrl="CQMS/Check/SpotCheckFile.aspx"></TreeNode>
<TreeNode id="8D5A7D48-21C0-4668-9E70-813AE9C523FA" Text="施工质量问题整改单" NavigateUrl="CQMS/Check/CheckListFile.aspx"></TreeNode>

11
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
View File

@ -33,11 +33,6 @@
<TreeNode id="6ce0b6bc-aa4d-4f0d-9f1f-75a553810793" Text="焊接任务单" NavigateUrl="HJGL/WeldingManage/WeldTask.aspx"></TreeNode>
<TreeNode id="5TYHMD2F-2582-4DEB-905E-6E9DCFEFBGHO" Text="焊接日报" NavigateUrl="HJGL/WeldingManage/WeldReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="7FE911EF-616A-4F04-AACD-E53E633A9E86" Text="热处理/硬度管理" NavigateUrl=""><TreeNode id="90579BE7-E38C-4CD2-A3BC-755169FF3BB2" Text="热处理委托" NavigateUrl="HJGL/HotProcessHard/HotProessTrust.aspx"></TreeNode>
<TreeNode id="71a7de4f-5216-41cb-bcc9-8a5e43d5d168" Text="热处理报告" NavigateUrl="HJGL/HotProcessHard/HotProessReport.aspx"></TreeNode>
<TreeNode id="72B3E508-1315-4CC3-939F-E840FA701A0E" Text="硬度检测委托" NavigateUrl="HJGL/HotProcessHard/HardTrust.aspx"></TreeNode>
<TreeNode id="c5ba5ef6-2112-4fe2-9ada-b8762cb629f6" Text="硬度检测报告" NavigateUrl="HJGL/HotProcessHard/HardReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="3363C60A-E1ED-445B-BC93-DF2BE04D9759" Text="无损检测管理" NavigateUrl=""><TreeNode id="3ACE25CE-C5CE-4CEC-AD27-0D5CF1DF2F01" Text="点口管理" NavigateUrl="HJGL/PointTrust/PointBatch.aspx"></TreeNode>
<TreeNode id="0CA58EC2-7934-49B3-A2C3-327FAD27C541" Text="无损检测委托单" NavigateUrl="HJGL/PointTrust/TrustBatch.aspx"></TreeNode>
<TreeNode id="CDECC461-1897-4D88-BD13-0824E540F565" Text="无损检测单录入" NavigateUrl="HJGL/NDT/NDTBatch.aspx?Type=1"></TreeNode>
@ -46,6 +41,11 @@
<TreeNode id="E5053406-1A22-42F1-846E-721ACA2253D6" Text="返修/扩透委托单" NavigateUrl="HJGL/RepairAndExpand/RepairTrust.aspx"></TreeNode>
<TreeNode id="27AA3C4C-D424-4CBA-ABBE-EDA953A196A4" Text="返修检测单录入" NavigateUrl="HJGL/NDT/NDTBatch.aspx?Type=R"></TreeNode>
</TreeNode>
<TreeNode id="7FE911EF-616A-4F04-AACD-E53E633A9E86" Text="热处理/硬度管理" NavigateUrl=""><TreeNode id="90579BE7-E38C-4CD2-A3BC-755169FF3BB2" Text="热处理委托" NavigateUrl="HJGL/HotProcessHard/HotProessTrust.aspx"></TreeNode>
<TreeNode id="71a7de4f-5216-41cb-bcc9-8a5e43d5d168" Text="热处理报告" NavigateUrl="HJGL/HotProcessHard/HotProessReport.aspx"></TreeNode>
<TreeNode id="72B3E508-1315-4CC3-939F-E840FA701A0E" Text="硬度检测委托" NavigateUrl="HJGL/HotProcessHard/HardTrust.aspx"></TreeNode>
<TreeNode id="c5ba5ef6-2112-4fe2-9ada-b8762cb629f6" Text="硬度检测报告" NavigateUrl="HJGL/HotProcessHard/HardReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="A24B7926-EF69-456E-8A24-936D30384680" Text="试压管理" NavigateUrl=""><TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
<TreeNode id="55976B16-2C33-406E-B514-2FE42D031071" Text="试压前条件确认" NavigateUrl="HJGL/TestPackage/TestPackageAudit.aspx"></TreeNode>
<TreeNode id="24941EDC-CED6-4176-8CCD-EB5F08156D08" Text="尾项检查及消项" NavigateUrl="HJGL/TestPackage/ItemEndCheck.aspx"></TreeNode>
@ -60,5 +60,6 @@
<TreeNode id="5F0969E3-2A0A-473E-92BE-4DD390602556" Text="焊接缺陷分析" NavigateUrl="HJGL/WeldingReport/DefectStatistics.aspx"></TreeNode>
<TreeNode id="EAD61207-E396-45B0-A1D2-7A5F0498AACC" Text="管道预制率分析" NavigateUrl="HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx"></TreeNode>
<TreeNode id="854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B" Text="焊工功效分析" NavigateUrl="HJGL/WeldingReport/WelderEfficacy.aspx"></TreeNode>
<TreeNode id="6035E549-66FF-4B6D-989B-BE99C9EF5EB7" Text="焊接数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx"></TreeNode>
</TreeNode>
</Tree>

1
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -100,6 +100,7 @@
<TreeNode id="0CDFC1BE-0796-4817-ADB8-7A0B48655E00" Text="应急演练开展情况季报" NavigateUrl="HSSE/InformationProject/DrillConductedQuarterlyReport.aspx"></TreeNode>
<TreeNode id="0973EE1C-CD2A-4116-BD67-1ABAD71D6C7C" Text="应急演练工作计划半年报" NavigateUrl="HSSE/InformationProject/DrillPlanHalfYearReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="C483220C-0FEE-4E45-9B78-BBBA857EFFB3" Text="安全数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx"></TreeNode>
</TreeNode>
<TreeNode id="0ED3E0CC-75E0-4FF3-8832-067217A6CD4D" Text="事故管理" NavigateUrl=""><TreeNode id="FB5C66FF-3BFB-490F-A14F-0DD5B5A4D110" Text="HSSE事故(对人员)记录" NavigateUrl="HSSE/Accident/AccidentPersonRecord.aspx"></TreeNode>
<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故(含未遂)处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>

1
SGGL/FineUIPro.Web/common/Menu_SysSet.xml
View File

@ -28,6 +28,7 @@
<TreeNode id="A424D70C-6763-4E2C-B41F-19C0DF1FA29F" Text="材料类型定义" NavigateUrl="BaseInfo/MaterialType.aspx"></TreeNode>
<TreeNode id="0BA0735E-2EFE-4E31-B7DD-A62E5F1E7BBD" Text="施工试验类型定义" NavigateUrl="BaseInfo/ConstructionTestType.aspx"></TreeNode>
<TreeNode id="CCD45D20-EA3F-47E7-8176-AB085778539E" Text="告知和监检类型定义" NavigateUrl="BaseInfo/NoticeAndSupervisionType.aspx"></TreeNode>
<TreeNode id="B9372A07-8A93-4EC0-9374-FDE1ED958DAE" Text="公司质量样板类别" NavigateUrl="BaseInfo/CompanyModelKind.aspx"></TreeNode>
<TreeNode id="99C99DF8-103F-4CA4-83CB-A6C924B5A698" Text="公司质量样板" NavigateUrl="BaseInfo/CompanyModel.aspx"></TreeNode>
<TreeNode id="164CDCED-E794-4177-AADE-23CA8E1AA1B8" Text="培训类别" NavigateUrl="BaseInfo/CQMSTrainType.aspx"></TreeNode>
<TreeNode id="D2027C3D-ECE9-445E-8DBE-AF0DA10005FC" Text="培训对象" NavigateUrl="BaseInfo/CQMSTrainObject.aspx"></TreeNode>

10
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -15,6 +15,16 @@
<TreeNode id="C619988F-307B-4A39-B518-7F45CA7326F5" Text="检查记录" NavigateUrl=""></TreeNode>
<TreeNode id="DEE90726-E00D-462B-A4BF-7E36180DD5B8" Text="项目绩效评价" NavigateUrl="OfficeCheck/ProjectEvaluation/ProjectEvaluation.aspx"></TreeNode>
</TreeNode>
<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="百万工时安全统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
<TreeNode id="4BC71D2E-7D94-48C1-A61A-139637825AA5" Text="职工伤亡事故原因分析报" NavigateUrl="ZHGL/Information/AccidentCauseReport.aspx"></TreeNode>
<TreeNode id="A3894BAD-3F4A-4BB4-98CF-A76C588AE53F" Text="安全生产数据季报" NavigateUrl="ZHGL/Information/SafetyQuarterlyReport.aspx"></TreeNode>
<TreeNode id="7985C759-8EB9-4B7D-AC65-00541280B46C" Text="应急演练开展情况季报" NavigateUrl="ZHGL/Information/DrillConductedQuarterlyReport.aspx"></TreeNode>
<TreeNode id="70DEB27A-D6FF-4D57-879B-0270F2967FA0" Text="应急演练工作计划半年报" NavigateUrl="ZHGL/Information/DrillPlanHalfYearReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="B9ADD006-BA46-4191-BCD1-CCB56767C82B" Text="总包施工质量计划" NavigateUrl="ZHGL/Plan/MainPlan.aspx"></TreeNode>
<TreeNode id="ABB667AF-2C50-40A6-9FC9-FC34A96582E3" Text="文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
</TreeNode>
</Tree>

2
SGGL/FineUIPro.Web/indexProject.aspx.cs
View File

@ -596,7 +596,7 @@ namespace FineUIPro.Web
protected void btnHome_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
&& ((this.CurrUser.UnitId == Const.UnitId_SEDIN && this.CurrUser.IsOffice == true) || this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId))
&& ((this.CurrUser.UnitId == Const.UnitId_SEDIN && (this.CurrUser.IsOffice == true || this.CurrUser.RoleIds != null)) || this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId))
{
Person_PersonsService.UpdateLastUserInfo(this.CurrUser.PersonId, null, true, this.CurrUser.LoginProjectId);
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;