shecs
/
Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shecs:0c5cd77c5bc7b7e4029f145674cf6ccf961d86b0
Branches Tags
shecs:master
...
compare: shecs:17ac63f758ee677eb579632e6d1b7c41663a17ea
Branches Tags
shecs:master

3 Commits
0c5cd77c5b ... 17ac63f758

Author SHA1 Message Date
佘春生 17ac63f758 11 2024-09-18 11:21:31 +08:00
佘春生 8fa946eba1 11 2024-06-24 10:30:14 +08:00
佘春生 8368dfde9b 111 2024-06-21 17:46:05 +08:00
23 changed files with 399 additions and 2507 deletions
Show Stats Expand all files Collapse all files

20
.gitignore vendored
View File

@ -1046,3 +1046,23 @@ EProject/WebApi/obj/Release/WebApi.pdb
/EProject/WebApi/.vs
/EProject/WebApi/obj
/EProject/packages
/DataBase/版本日志/已更新
/DataBase/版本日志/EProjectDB_2023-11-01.sql
/DataBase/版本日志/EProjectDB_2024-01-04.sql
/DataBase/版本日志/EProjectDB_2024-02-02.sql
/DataBase/版本日志/EProjectDB_2024-04-03.sql
/DataBase/版本日志/EProjectDB_2024-04-11sql.sql
/DataBase/版本日志/EProjectDB_2024-05-24.sql
/DataBase/版本日志/EProjectDB_2024-05-29.sql
/DataBase/版本日志/EProjectDB_2024-06-20.sql
/DataBase/版本日志/EProjectDB_2024-07-04.sql
/DataBase/版本日志/EProjectDB_2024-07-10.sql
/DataBase/版本日志
/DataBase/eprojectDB_2024.05.14.rar
/DataBase/eProjectDB_20240725.bak
/DataBase/eProjectDB_20240725.zip
/DataBase/eProjectDB_20240725（本机）.bak
/DataBase/eprojectDB_2024.05.14.bak
/EProjectPackFile_2024.07.30
/EProjectPackFile_2024.07.30.rar
/EProject/FineUIPro.Web/ErrLog.txt

BIN
DataBase/eprojectDB_2024.05.14.bak
View File

Binary file not shown.

BIN
DataBase/eprojectDB_2024.05.14.rar
View File

Binary file not shown.

57
DataBase/版本日志/EProjectDB_2023-11-01.sql
View File

@ -1,57 +0,0 @@
ALTER VIEW [dbo].[View_EprojectAPI]
AS
SELECT pro.EProjectId AS Id, pro.CreatePerson AS Create_by,pro.CreateDate AS Create_time,pro.ModifyPerson AS Update_by,pro.ModifyDate AS Update_time,
pro.ProjectControl_BUCode AS Bu_code,pro.ProjectControl_JobNo AS Job_no,pro.ProjectControl_JobType AS Job_type,pro.ProjectControl_LeadByName AS Lead_by,
pro.ProjectControl_JobTitle AS Job_title,pro.ProjectControl_OrginalBudget AS Budget,pro.ProjectControl_ProjectManager AS Project_manager,
pro.ProjectControl_ConstManager AS Construction_manager,pro.ProjectControl_EMManager AS Engineering_manager,
CONVERT(NVARCHAR(10),pro.PM_MA_ProjectApproval,111) AS Approval_date,
CONVERT(NVARCHAR(10),pro.ProjectControl_MS_MC,111) AS Mc_planed,
(CASE WHEN pro.CM_CC_RevisedEnd IS NULL THEN CONVERT(NVARCHAR(10),pro.CM_CM_RevisedEnd,23)
WHEN pro.CM_CM_RevisedEnd IS NULL THEN CONVERT(NVARCHAR(10),pro.CM_CC_RevisedEnd,23)
WHEN pro.CM_CC_RevisedEnd IS NOT NULL AND pro.CM_CM_RevisedEnd IS NOT NULL AND pro.CM_CC_RevisedEnd >= pro.CM_CM_RevisedEnd
THEN CONVERT(NVARCHAR(10),pro.CM_CC_RevisedEnd,23)
WHEN pro.CM_CC_RevisedEnd IS NOT NULL AND pro.CM_CM_RevisedEnd IS NOT NULL AND pro.CM_CC_RevisedEnd <= pro.CM_CM_RevisedEnd
THEN CONVERT(NVARCHAR(10),pro.CM_CM_RevisedEnd,23) END) AS Mc_revised,
pro.PM_General_Priority AS Priority,pro.PM_General_Category AS Category,
pro.ProjectControl_JobStatus AS Job_status,
(CASE WHEN DATEDIFF(DAY,pro.PM_MA_ProjectApproval,pro.ProjectControl_CM_SchEnd)>0
THEN (CASE WHEN (DATEDIFF(DAY,pro.ProjectControl_CM_SchEnd,pro.CM_CM_RevisedEnd)/DATEDIFF(DAY,pro.PM_MA_ProjectApproval,pro.ProjectControl_CM_SchEnd))>0.1 THEN 'C'
WHEN (DATEDIFF(DAY,pro.ProjectControl_CM_SchEnd,pro.CM_CM_RevisedEnd)/DATEDIFF(DAY,pro.PM_MA_ProjectApproval,pro.ProjectControl_CM_SchEnd))<=0.1 AND (DATEDIFF(DAY,pro.ProjectControl_CM_SchEnd,pro.CM_CM_RevisedEnd)/DATEDIFF(DAY,pro.PM_MA_ProjectApproval,pro.ProjectControl_CM_SchEnd))>0.05 THEN 'B'
WHEN (DATEDIFF(DAY,pro.ProjectControl_CM_SchEnd,pro.CM_CM_RevisedEnd)/DATEDIFF(DAY,pro.PM_MA_ProjectApproval,pro.ProjectControl_CM_SchEnd))<=0.05 THEN 'A'
ELSE '' END)
ELSE ''END) AS Schedule,--Sche. AS Schedule,
(CASE WHEN (SELECT TOP 1 OrginalBudget+ ChangedBudget FROM dbo.Editor_CostReport WHERE EProjectId= pro.EProjectId ORDER BY Monthly DESC)>0
THEN (CASE WHEN (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=pro.EProjectId ORDER BY Monthly DESC)>0.1 THEN 'C'
WHEN (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=pro.EProjectId ORDER BY Monthly DESC)>0.05 AND (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=pro.EProjectId ORDER BY Monthly DESC)<=0.1 THEN 'B'
WHEN (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=pro.EProjectId ORDER BY Monthly DESC)<=0.05 THEN 'A' ELSE '' END)
ELSE '' END) AS Cost,
(CASE WHEN pro.PM_SC_PendingQty>0 THEN 'C'
WHEN (pro.PM_SC_PendingQty=0 OR pro.PM_SC_PendingQty IS NULL) AND PM_SC_ApprovedQty>0 THEN 'B'
WHEN (pro.PM_SC_ApprovedQty=0 OR pro.PM_SC_ApprovedQty IS NULL) AND (pro.PM_SC_PendingQty=0 OR pro.PM_SC_PendingQty IS NULL) THEN 'A'
ELSE '' END) AS Scope,
CONVERT(NVARCHAR(10),pro.PM_MA_JobReveive,111) AS Received_date,
(CASE WHEN (SELECT TOP 1 ISNULL(ActualCost,0)+ISNULL(CommittedPRPO,0)+ISNULL(CommittedSSRs,0)+ISNULL(CostToComplete,0) FROM dbo.Editor_CostReport WHERE EProjectId=pro.EprojectId ORDER BY Monthly DESC) IS NOT NULL
THEN (SELECT TOP 1 ISNULL(ActualCost,0)+ISNULL(CommittedPRPO,0)+ISNULL(CommittedSSRs,0)+ISNULL(CostToComplete,0) FROM dbo.Editor_CostReport WHERE EProjectId=pro.EprojectId ORDER BY Monthly DESC)
ELSE 0 END) AS Estimated_fianl_cost,
CONVERT(NVARCHAR(10),CM_MA_MC,111) AS Mc_actual,
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceiveHC FROM dbo.Editor_TDC WHERE EProjectId=pro.EProjectId AND [Type]='D11_MC' ORDER BY ReceiveHC DESC),111) AS MC_Signed,
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceiveHC FROM dbo.Editor_TDC WHERE Type='D12_RFSU' AND ReceiveHC IS NOT NULL AND EProjectId=pro.EProjectId ORDER BY ReceiveHC DESC),111) as Rfsu,
CONVERT(NVARCHAR(10), pro.CM_Punch_CKilledDate,111) AS Punch_c_killed,
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceiveHC FROM dbo.Editor_TDC WHERE EProjectId=pro.EProjectId AND [Type]='D30_FC' ORDER BY ReceiveHC DESC),111) AS Fc_signed,
CONVERT(NVARCHAR(10),pro.ProjectControl_BC_CloseDate,111) AS Business_closed,
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceiveHC FROM dbo.Editor_TDC WHERE EProjectId=pro.EProjectId AND [Type]='D01_IFC' AND Disc='00_ALL'),111) AS Ifc_received,
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceiveHC FROM dbo.Editor_TDC WHERE EProjectId=pro.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='00_ALL'),111) AS As_built_received,
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceivePDF FROM dbo.Editor_TDC WHERE EProjectId=pro.EProjectId AND [Type]='D03_MD' ORDER BY ReceivePDF DESC),111) AS Md_received,
CONVERT(NVARCHAR(10),pro.CM_Date_of_Registration,23) AS Date_registeration,pro.ProjectControl_CostEffectvitity AS Cost_effectivity,
pro.ProjectControl_PVIPrediction AS PVI,
CONVERT(NVARCHAR(10),pro.ProjectControl_PC_CancelDate,111) AS Cancel_date,pro.ProjectControl_Account AS Account_no,
pro.ProjectControl_NetworkNo AS Network_no,pro.StudyWo AS Study_wo,pro.CTEInvolved AS Cte_involved, pro.CAPEXPlanNo AS Capex_plan_no,
pro.PM_General_CDI AS CDI
FROM dbo.Editor_EProject pro
GO

368
DataBase/版本日志/EProjectDB_2024-01-04.sql
View File

@ -1,368 +0,0 @@

ALTER VIEW [dbo].[View_Report_DocumentationStatusMC]
AS
/*********DocumentationStatusMC报告*************/
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D01_IFC' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='01_Process' ORDER BY ReceiveHC DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='30_Plumbing/F.F' ORDER BY ReceiveHC DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='40_Mech./Equi.' ORDER BY ReceiveHC DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='50_Piping' ORDER BY ReceiveHC DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='60_Electrical' ORDER BY ReceiveHC DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='65_Telecommunication' ORDER BY ReceiveHC DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='70_Instrument' ORDER BY ReceiveHC DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='10_Civil' ORDER BY ReceiveHC DESC) AS Civil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='20_Architectral' ORDER BY ReceiveHC DESC) AS Architectral,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='20_HVAC' ORDER BY ReceiveHC DESC) AS HVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='10_MasterpLanning' ORDER BY ReceiveHC DESC) AS MasterpLanning,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='02_HSE' ORDER BY ReceiveHC DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='00_ALL' ORDER BY ReceiveHC DESC) AS ALLS
FROM dbo.Editor_EProject eproject
UNION ALL
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D02_AS-BUILT' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='01_Process' ORDER BY ReceiveHC DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='30_Plumbing/F.F' ORDER BY ReceiveHC DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='40_Mech./Equi.' ORDER BY ReceiveHC DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='50_Piping' ORDER BY ReceiveHC DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='60_Electrical' ORDER BY ReceiveHC DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='65_Telecommunication' ORDER BY ReceiveHC DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='70_Instrument' ORDER BY ReceiveHC DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='10_Civil' ORDER BY ReceiveHC DESC) AS Civil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='20_Architectral' ORDER BY ReceiveHC DESC) AS Architectral,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='20_HVAC' ORDER BY ReceiveHC DESC) AS HVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='10_MasterpLanning' ORDER BY ReceiveHC DESC) AS MasterpLanning,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='02_HSE' ORDER BY ReceiveHC DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='00_ALL' ORDER BY ReceiveHC DESC) AS ALLS
FROM dbo.Editor_EProject eproject
UNION ALL
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D03_MD' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='01_Process' ORDER BY ReceivePDF DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='30_Plumbing/F.F' ORDER BY ReceivePDF DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='40_Mech./Equi.' ORDER BY ReceivePDF DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='50_Piping' ORDER BY ReceivePDF DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='60_Electrical' ORDER BY ReceivePDF DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='65_Telecommunication' ORDER BY ReceivePDF DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='70_Instrument' ORDER BY ReceivePDF DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='10_Civil' ORDER BY ReceivePDF DESC) AS Civil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='20_Architectral' ORDER BY ReceivePDF DESC) AS Architectral,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='20_HVAC' ORDER BY ReceivePDF DESC) AS HVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='10_MasterpLanning' ORDER BY ReceivePDF DESC) AS MasterpLanning,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='02_HSE' ORDER BY ReceivePDF DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='00_ALL' ORDER BY ReceivePDF DESC) AS ALLS
FROM dbo.Editor_EProject eproject
GO
ALTER VIEW [dbo].[View_Report_DocumentationStatusMC_OUT]
AS
/*********DocumentationStatusMC报告*************/
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,eProject.PM_General_CDI,eProject.OutSourceType,
(CASE WHEN CONVERT(VARCHAR(10), eproject.ProjectControl_MS_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) ELSE '' END) AS ApprSch,
(CASE WHEN CONVERT(VARCHAR(10), eproject.PM_MA_ProjectApproval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) ELSE '' END) AS ApprAct,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D01_IFC' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='01_Process' ORDER BY ReceiveHC DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='30_Plumbing/F.F' ORDER BY ReceiveHC DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='40_Mech./Equi.' ORDER BY ReceiveHC DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='50_Piping' ORDER BY ReceiveHC DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='60_Electrical' ORDER BY ReceiveHC DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='65_Telecommunication' ORDER BY ReceiveHC DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='70_Instrument' ORDER BY ReceiveHC DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='10_Civil' ORDER BY ReceiveHC DESC) AS Civil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='20_Architectral' ORDER BY ReceiveHC DESC) AS Architectral,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='20_HVAC' ORDER BY ReceiveHC DESC) AS HVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='10_MasterpLanning' ORDER BY ReceiveHC DESC) AS MasterpLanning,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='02_HSE' ORDER BY ReceiveHC DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='00_ALL' ORDER BY ReceiveHC DESC) AS ALLS,
-----------------------------------------------
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%P10%' OR p.Roles LIKE '%P11%' OR p.Roles LIKE '%P12%' OR p.Roles LIKE '%P13%')
--FOR XML PATH('')),1,1,'') AS P1_Process,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%P30%' OR p.Roles LIKE '%P31%' OR p.Roles LIKE '%P32%' OR p.Roles LIKE '%P33%')
--FOR XML PATH('')),1,1,'') AS P3_Plumbing_FF,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%P20%' OR p.Roles LIKE '%P21%' OR p.Roles LIKE '%P22%' OR p.Roles LIKE '%P23%')
--FOR XML PATH('')),1,1,'') AS P2_Mech_Equi,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%P40%' OR p.Roles LIKE '%P41%' OR p.Roles LIKE '%P42%' OR p.Roles LIKE '%P43%')
--FOR XML PATH('')),1,1,'') AS P4_Piping,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%A20%' OR p.Roles LIKE '%A21%' OR p.Roles LIKE '%A22%' OR p.Roles LIKE '%A23%')
--FOR XML PATH('')),1,1,'') AS A2_Electrical,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%A30%' OR p.Roles LIKE '%A31%' OR p.Roles LIKE '%A32%' OR p.Roles LIKE '%A33%')
--FOR XML PATH('')),1,1,'') AS A3_Telec,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%A10%' OR p.Roles LIKE '%A11%' OR p.Roles LIKE '%A12%' OR p.Roles LIKE '%A13%')
--FOR XML PATH('')),1,1,'') AS A1_Instrument,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%C10%' OR p.Roles LIKE '%C11%' OR p.Roles LIKE '%C12%' OR p.Roles LIKE '%C13%')
--FOR XML PATH('')),1,1,'') AS C1_Civil,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%C30%' OR p.Roles LIKE '%C31%' OR p.Roles LIKE '%C32%' OR p.Roles LIKE '%C33%')
--FOR XML PATH('')),1,1,'') AS C3_Architectral,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%C40%' OR p.Roles LIKE '%C41%' OR p.Roles LIKE '%C42%' OR p.Roles LIKE '%C43%')
--FOR XML PATH('')),1,1,'') AS C4_HVAC,
--STUFF((SELECT ','+u.UserName FROM ManHours_Plan AS p
-- LEFT JOIN Sys_User AS u ON u.UserId = p.EngineerId
-- WHERE p.EProjectId = eproject.EProjectId
-- AND (p.Roles LIKE '%C20%' OR p.Roles LIKE '%C21%' OR p.Roles LIKE '%C22%' OR p.Roles LIKE '%C23%')
--FOR XML PATH('')),1,1,'') AS C2_MasterPlanning,
pu.UserName AS P1_Process,
'' AS P3_Plumbing_FF,
meu.UserName AS P2_Mech_Equi,
pu.UserName AS P4_Piping,
eleu.UserName AS A2_Electrical,
eleu.UserName AS A3_Telec,
insu.UserName AS A1_Instrument,
civu.UserName AS C1_Civil,
'' AS C3_Architectral,
'' AS C4_HVAC,
'' AS C2_MasterPlanning,
-----------------------------------------------
s.Detail_Eng_Civil_Sch_Start,--PROJ_DE_CIVIL_SCH_START_DATE
s.Detail_Eng_Civil_Sch_End,--PROJ_DE_CIVIL_SCH_END_DATE
s.PROJ_DE_CIVIL_ACU_START_DATE,--PROJ_DE_CIVIL_ACU_START_DATE
s.PROJ_DE_CIVIL_ACU_END_DATE,--PROJ_DE_CIVIL_ACU_END_DATE
s.Detail_Eng_Mech_EI_Sch_Start,--PROJ_DE_ME_SCH_START_DATE
s.PROJ_DE_ME_SCH_END_DATE,--PROJ_DE_ME_SCH_END_DATE
s.Detail_Eng_Mech_EI_Sch_End,--PROJ_DE_ME_ACU_START_DATE
s.PROJ_DE_ME_ACU_END_DATE --PROJ_DE_ME_ACU_END_DATE
FROM dbo.Editor_EProject eproject
LEFT JOIN dbo.Sys_User pu ON eproject.ProjectControl_CI_Process=pu.UserId
LEFT JOIN dbo.Sys_User meu ON eproject.ProjectControl_CI_Equipment=meu.UserId
LEFT JOIN dbo.Sys_User eleu ON eproject.ProjectControl_CI_Electrical=eleu.UserId
LEFT JOIN dbo.Sys_User insu ON eproject.ProjectControl_CI_Instrument=insu.UserId
LEFT JOIN dbo.Sys_User civu ON eproject.ProjectControl_CI_Civil=civu.UserId
LEFT JOIN dbo.View_ScheduleDate s ON s.EProjectId = eproject.EProjectId
UNION ALL
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,eProject.PM_General_CDI,eProject.OutSourceType,
(CASE WHEN CONVERT(VARCHAR(10), eproject.ProjectControl_MS_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) ELSE '' END) AS ApprSch,
(CASE WHEN CONVERT(VARCHAR(10), eproject.PM_MA_ProjectApproval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) ELSE '' END) AS ApprAct,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D02_AS-BUILT' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='01_Process' ORDER BY ReceiveHC DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='30_Plumbing/F.F' ORDER BY ReceiveHC DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='40_Mech./Equi.' ORDER BY ReceiveHC DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='50_Piping' ORDER BY ReceiveHC DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='60_Electrical' ORDER BY ReceiveHC DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='65_Telecommunication' ORDER BY ReceiveHC DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='70_Instrument' ORDER BY ReceiveHC DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='10_Civil' ORDER BY ReceiveHC DESC) AS Civil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='20_Architectral' ORDER BY ReceiveHC DESC) AS Architectral,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='20_HVAC' ORDER BY ReceiveHC DESC) AS HVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='10_MasterpLanning' ORDER BY ReceiveHC DESC) AS MasterpLanning,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='02_HSE' ORDER BY ReceiveHC DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D02_AS-BUILT' AND Disc='00_ALL' ORDER BY ReceiveHC DESC) AS ALLS,
-----------------------------------------------
pu.UserName AS P1_Process,
'' AS P3_Plumbing_FF,
meu.UserName AS P2_Mech_Equi,
pu.UserName AS P4_Piping,
eleu.UserName AS A2_Electrical,
eleu.UserName AS A3_Telec,
insu.UserName AS A1_Instrument,
civu.UserName AS C1_Civil,
'' AS C3_Architectral,
'' AS C4_HVAC,
'' AS C2_MasterPlanning,
-----------------------------------------------
s.Detail_Eng_Civil_Sch_Start,--PROJ_DE_CIVIL_SCH_START_DATE
s.Detail_Eng_Civil_Sch_End,--PROJ_DE_CIVIL_SCH_END_DATE
s.PROJ_DE_CIVIL_ACU_START_DATE,--PROJ_DE_CIVIL_ACU_START_DATE
s.PROJ_DE_CIVIL_ACU_END_DATE,--PROJ_DE_CIVIL_ACU_END_DATE
s.Detail_Eng_Mech_EI_Sch_Start,--PROJ_DE_ME_SCH_START_DATE
s.PROJ_DE_ME_SCH_END_DATE,--PROJ_DE_ME_SCH_END_DATE
s.Detail_Eng_Mech_EI_Sch_End,--PROJ_DE_ME_ACU_START_DATE
s.PROJ_DE_ME_ACU_END_DATE --PROJ_DE_ME_ACU_END_DATE
FROM dbo.Editor_EProject eproject
LEFT JOIN dbo.Sys_User pu ON eproject.ProjectControl_CI_Process=pu.UserId
LEFT JOIN dbo.Sys_User meu ON eproject.ProjectControl_CI_Equipment=meu.UserId
LEFT JOIN dbo.Sys_User eleu ON eproject.ProjectControl_CI_Electrical=eleu.UserId
LEFT JOIN dbo.Sys_User insu ON eproject.ProjectControl_CI_Instrument=insu.UserId
LEFT JOIN dbo.Sys_User civu ON eproject.ProjectControl_CI_Civil=civu.UserId
LEFT JOIN dbo.View_ScheduleDate s ON s.EProjectId = eproject.EProjectId
UNION ALL
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,eProject.PM_General_CDI,eProject.OutSourceType,
(CASE WHEN CONVERT(VARCHAR(10), eproject.ProjectControl_MS_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) ELSE '' END) AS ApprSch,
(CASE WHEN CONVERT(VARCHAR(10), eproject.PM_MA_ProjectApproval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) ELSE '' END) AS ApprAct,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D03_MD' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='01_Process' ORDER BY ReceivePDF DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='30_Plumbing/F.F' ORDER BY ReceivePDF DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='40_Mech./Equi.' ORDER BY ReceivePDF DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='50_Piping' ORDER BY ReceivePDF DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='60_Electrical' ORDER BY ReceivePDF DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='65_Telecommunication' ORDER BY ReceivePDF DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='70_Instrument' ORDER BY ReceivePDF DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='10_Civil' ORDER BY ReceivePDF DESC) AS Civil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='20_Architectral' ORDER BY ReceivePDF DESC) AS Architectral,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='20_HVAC' ORDER BY ReceivePDF DESC) AS HVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='10_MasterpLanning' ORDER BY ReceivePDF DESC) AS MasterpLanning,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='02_HSE' ORDER BY ReceivePDF DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceivePDF,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D03_MD' AND Disc='00_ALL' ORDER BY ReceivePDF DESC) AS ALLS,
-----------------------------------------------
pu.UserName AS P1_Process,
'' AS P3_Plumbing_FF,
meu.UserName AS P2_Mech_Equi,
pu.UserName AS P4_Piping,
eleu.UserName AS A2_Electrical,
eleu.UserName AS A3_Telec,
insu.UserName AS A1_Instrument,
civu.UserName AS C1_Civil,
'' AS C3_Architectral,
'' AS C4_HVAC,
'' AS C2_MasterPlanning,
-----------------------------------------------
s.Detail_Eng_Civil_Sch_Start,--PROJ_DE_CIVIL_SCH_START_DATE
s.Detail_Eng_Civil_Sch_End,--PROJ_DE_CIVIL_SCH_END_DATE
s.PROJ_DE_CIVIL_ACU_START_DATE,--PROJ_DE_CIVIL_ACU_START_DATE
s.PROJ_DE_CIVIL_ACU_END_DATE,--PROJ_DE_CIVIL_ACU_END_DATE
s.Detail_Eng_Mech_EI_Sch_Start,--PROJ_DE_ME_SCH_START_DATE
s.PROJ_DE_ME_SCH_END_DATE,--PROJ_DE_ME_SCH_END_DATE
s.Detail_Eng_Mech_EI_Sch_End,--PROJ_DE_ME_ACU_START_DATE
s.PROJ_DE_ME_ACU_END_DATE --PROJ_DE_ME_ACU_END_DATE
FROM dbo.Editor_EProject eproject
LEFT JOIN dbo.Sys_User pu ON eproject.ProjectControl_CI_Process=pu.UserId
LEFT JOIN dbo.Sys_User meu ON eproject.ProjectControl_CI_Equipment=meu.UserId
LEFT JOIN dbo.Sys_User eleu ON eproject.ProjectControl_CI_Electrical=eleu.UserId
LEFT JOIN dbo.Sys_User insu ON eproject.ProjectControl_CI_Instrument=insu.UserId
LEFT JOIN dbo.Sys_User civu ON eproject.ProjectControl_CI_Civil=civu.UserId
LEFT JOIN dbo.View_ScheduleDate s ON s.EProjectId = eproject.EProjectId
GO
ALTER VIEW [dbo].[View_Report_DocumentationStatusIFC]
AS
/*********DocumentationStatusIFC报告*************/
SELECT eproject.EProjectId,eproject.ProjectControl_JobNo,
eproject.ProjectControl_ProjectManager,eproject.ProjectControl_LeadByName,
eproject.ProjectControl_BUCode,CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS MC,
eproject.ProjectControl_JobStatus,eproject.ProjectControl_JobType,
eproject.PM_MA_JobReveive,
(SELECT TOP 1 UserName FROM dbo.Sys_User WHERE UserId=(SELECT TOP 1 EngineerId FROM dbo.ManHours_Plan WHERE EProjectId=eproject.EProjectId AND Roles='D10')) AS ProjectControl_TDCManager,
'D01_IFC' AS Phase,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Process') AS PlanProcess,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='01_Process' ORDER BY ReceiveHC DESC) AS Process,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Plumbing/F.F') AS PlanPlumbing,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='30_Plumbing/F.F' ORDER BY ReceiveHC DESC) AS Plumbling,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Mech./Equi.') AS PlanEquipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='40_Mech./Equi.' ORDER BY ReceiveHC DESC) AS Equipment,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Piping') AS PlanPiping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='50_Piping' ORDER BY ReceiveHC DESC) AS Piping,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Electrical') AS PlanElectrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='60_Electrical' ORDER BY ReceiveHC DESC) AS Electrical,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Telecommunication') AS PlanTelecommunication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='65_Telecommunication' ORDER BY ReceiveHC DESC) AS Communication,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Instrument') AS PlanInstrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='70_Instrument' ORDER BY ReceiveHC DESC) AS Instrument,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Civil') AS PlanCivil,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='10_Civil' ORDER BY ReceiveHC DESC) AS CivilStruc,
(SELECT TOP 1 CONVERT(NVARCHAR(10),SchEnd,23) FROM dbo.Editor_PM WHERE EProjectId=eproject.EProjectId AND DisciplinesWBSName ='Architectral') AS PlanHVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='20_Architectral' ORDER BY ReceiveHC DESC) AS ArchHVAC,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='02_HSE' ORDER BY ReceiveHC DESC) AS HSE,
(SELECT TOP 1 CONVERT(NVARCHAR(10),ReceiveHC,23) FROM dbo.Editor_TDC WHERE EProjectId=eproject.EProjectId AND [Type]='D01_IFC' AND Disc='00_ALL' ORDER BY ReceiveHC DESC) AS ALLS
FROM dbo.Editor_EProject eproject
GO

8
DataBase/版本日志/EProjectDB_2024-02-02.sql
View File

@ -1,8 +0,0 @@

ALTER TABLE dbo.Base_DisciplinesWBS ADD NetworkOper1 NVARCHAR(50) NULL
GO
UPDATE dbo.Base_DisciplinesWBS SET NetworkOper1=LEFT(NetworkOper,3)+'1'
GO

231
DataBase/版本日志/EProjectDB_2024-04-03.sql
View File

@ -1,231 +0,0 @@
ALTER TABLE dbo.Editor_EProject ADD PM_Planning_Approval DATETIME NULL
ALTER TABLE dbo.Editor_EProject ADD PM_Pre_Approval DATETIME NULL
GO
ALTER PROCEDURE [dbo].[ProjectSchedule]
@EProjectId VARCHAR(50)
AS
/*********首页Schedule第一部分**********/
SELECT 1 AS id,
'Job Receive' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10),PM_MA_JobReveive, 23) IS NOT NULL THEN CONVERT(VARCHAR(10),PM_MA_JobReveive, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 2 AS id,
'Planning Cost Approval' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10),PM_Planning_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10),PM_Planning_Approval, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
--(CASE WHEN CONVERT(VARCHAR(10),eProject.ProjectControl_MS_ResourcePlanReceived,23) IS NOT NULL
--THEN CONVERT(VARCHAR(10),eProject.ProjectControl_MS_ResourcePlanReceived,23) ELSE 'N.A' END) AS Actual
--FROM dbo.Editor_EProject AS eProject
--WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 3 AS id,
'Pre-approval' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10),PM_Pre_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10),PM_Pre_Approval, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 4 AS id,
'Kick-off Meeting' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), PM_MA_KickOffMeeting, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_KickOffMeeting, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 5 AS id,
'SR1/2' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_MS_SR, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_SR, 23) ELSE 'N.A' END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), PM_MA_SR, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_SR, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 6 AS id,
'Final Approval' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) ELSE 'N.A' END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 7 AS id,
'MC' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23) IS NOT NULL AND ProjectControl_Revised_MC_Date=ProjectControl_MS_MC
THEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23)
ELSE CASE WHEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23) IS NOT NULL AND ProjectControl_Revised_MC_Date!=ProjectControl_MS_MC
THEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23)+'*'
ELSE 'N.A' END END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), CM_MA_MC, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), CM_MA_MC, 23)ELSE 'N.A' END)AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 8 AS id,
'Close' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_MS_Close, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Close, 23) ELSE 'N.A' END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_ClosedDate, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_ClosedDate, 23) ELSE 'N.A' END)as Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 9 AS id,
'Cancel' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_PC_CancelDate, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_PC_CancelDate, 23) ELSE 'N.A' END) AS Schedule,
'N.A' AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
GO
ALTER VIEW [dbo].[View_ProjectListReport]
AS
/*********报表：项目列表 佘春生修改于2023.03.01*********/
SELECT eproject.EProjectId,
eproject.ProjectControl_BUCode,--BU.
eproject.ProjectControl_JobNo,--Job No
eproject.ProjectControl_JobType,--Job Type
eproject.ProjectControl_LeadByName,--Lead By
eproject.ProjectControl_JobTitle,--Job Title
ISNULL(eproject.ProjectControl_OrginalBudget,0) AS OrginalBudget,--Org. Budget
eproject.ProjectControl_ChangedBudget AS ChangedBudget,
eproject.PM_General_CostToComplete AS CostToComplete,
(ISNULL(eproject.ProjectControl_Actual,0)+ISNULL(eproject.ProjectControl_CommittedPRPO,0)+
ISNULL(eproject.ProjectControl_CommittedSSRs,0)+ISNULL(eproject.PM_General_CostToComplete,0)) AS FinalCost,
--(CASE WHEN (SELECT TOP 1 ISNULL(cost.ChangedBudget,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC) IS NOT NULL
--THEN (SELECT TOP 1 ISNULL(cost.ChangedBudget,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC)
--ELSE 0 END) AS ChangedBudget,--Chd. Budget
--(CASE WHEN (SELECT TOP 1 ISNULL(cost.CostToComplete,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC) IS NOT NULL
--THEN (SELECT TOP 1 ISNULL(cost.CostToComplete,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC)
--ELSE 0 END) AS CostToComplete,--Cost.Comp
--((CASE WHEN (SELECT TOP 1 ISNULL(cost.ActualCost,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC) IS NOT NULL
--THEN (SELECT TOP 1 ISNULL(cost.ActualCost,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC)
--ELSE 0 END)+
--(CASE WHEN (SELECT TOP 1 ISNULL(cost.CommittedPRPO,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC) IS NOT NULL
--THEN (SELECT TOP 1 ISNULL(cost.CommittedPRPO,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC)
--ELSE 0 END)+
--(CASE WHEN (SELECT TOP 1 ISNULL(cost.CommittedSSRs,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC) IS NOT NULL
--THEN (SELECT TOP 1 ISNULL(cost.CommittedSSRs,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC)
--ELSE 0 END)+
--(CASE WHEN (SELECT TOP 1 ISNULL(cost.CostToComplete,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC) IS NOT NULL
--THEN (SELECT TOP 1 ISNULL(cost.CostToComplete,0) FROM dbo.Editor_CostReport AS cost WHERE cost.EProjectId=eproject.EProjectId ORDER BY cost.Monthly DESC)
--ELSE 0 END)) AS FinalCost,--Final Cost
eproject.ProjectControl_ProjectManager,--Proj. Manager
eproject.ProjectControl_ConstManager,--Const. Manager
eproject.ProjectControl_EMManager,
CONVERT(NVARCHAR(10),eproject.PM_MA_JobReveive,23) AS RECEIVES,--RECEIVE
CONVERT(NVARCHAR(10),eproject.ProjectControl_MS_Approval,23) AS ProjectControl_MS_Approval,--Appr Date(Sch)
CONVERT(NVARCHAR(10),eproject.PM_MA_ProjectApproval,23) AS PM_MA_ProjectApproval,--Appr Date(Act)
CONVERT(NVARCHAR(10),eproject.ProjectControl_MS_MC,23) AS ProjectControl_MS_MC,--MC (Plan)
CONVERT(NVARCHAR(10),eproject.CM_MA_MC,23) AS CM_MA_MC,--MC (Act)
CONVERT(NVARCHAR(10),eproject.ProjectControl_MS_Close,23) AS ProjectControl_MS_Close,--CLOSE(Sch)
CONVERT(NVARCHAR(10),eproject.ProjectControl_ClosedDate,23) AS CloseAct,--CLOSE(Act) 代码中处理
CONVERT(NVARCHAR(10),eproject.ProjectControl_PC_CancelDate,23) AS ProjectControl_PC_CancelDate,--Cancel Date
CONVERT(NVARCHAR(10),eproject.ProjectControl_BC_CloseDate,23) AS ProjectControl_BC_CloseDate,--B. Close
eproject.PM_General_Priority,--Priority
eproject.ProjectControl_JobStatus,--Job Status
eproject.PM_Critical,
(SELECT TOP 1 ConstText FROM dbo.Sys_Const WHERE ConstValue=eproject.PM_ReasonForCritical AND GroupId='ReasonForCritical') AS PM_ReasonForCritical,
(CASE WHEN DATEDIFF(DAY,eproject.PM_MA_ProjectApproval,eproject.ProjectControl_CM_SchEnd)>0
THEN (CASE WHEN (DATEDIFF(DAY,eproject.ProjectControl_CM_SchEnd,eproject.CM_CM_RevisedEnd)/DATEDIFF(DAY,eproject.PM_MA_ProjectApproval,eproject.ProjectControl_CM_SchEnd))>0.1 THEN 'C'
WHEN (DATEDIFF(DAY,eproject.ProjectControl_CM_SchEnd,eproject.CM_CM_RevisedEnd)/DATEDIFF(DAY,eproject.PM_MA_ProjectApproval,eproject.ProjectControl_CM_SchEnd))<=0.1 AND (DATEDIFF(DAY,eproject.ProjectControl_CM_SchEnd,eproject.CM_CM_RevisedEnd)/DATEDIFF(DAY,eproject.PM_MA_ProjectApproval,eproject.ProjectControl_CM_SchEnd))>0.05 THEN 'B'
WHEN (DATEDIFF(DAY,eproject.ProjectControl_CM_SchEnd,eproject.CM_CM_RevisedEnd)/DATEDIFF(DAY,eproject.PM_MA_ProjectApproval,eproject.ProjectControl_CM_SchEnd))<=0.05 THEN 'A'
ELSE '' END)
ELSE ''END) AS Schedule,--Sche.
(CASE WHEN (SELECT TOP 1 OrginalBudget+ ChangedBudget FROM dbo.Editor_CostReport WHERE EProjectId= eproject.EProjectId ORDER BY Monthly DESC)>0
THEN (CASE WHEN (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=eproject.EProjectId ORDER BY Monthly DESC)>0.1 THEN 'C'
WHEN (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=eproject.EProjectId ORDER BY Monthly DESC)>0.05 AND (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=eproject.EProjectId ORDER BY Monthly DESC)<=0.1 THEN 'B'
WHEN (SELECT TOP 1 (ActualCost+CommittedPRPO+CommittedSSRs+CostToComplete-OrginalBudget-ChangedBudget)/(OrginalBudget+ChangedBudget) FROM dbo.Editor_CostReport WHERE EProjectId=eproject.EProjectId ORDER BY Monthly DESC)<=0.05 THEN 'A' ELSE '' END)
ELSE '' END) AS Cost,--Cost
(CASE WHEN eproject.PM_SC_PendingQty>0 THEN 'C'
WHEN (eproject.PM_SC_PendingQty=0 OR eproject.PM_SC_PendingQty IS NULL) AND PM_SC_ApprovedQty>0 THEN 'B'
WHEN (eproject.PM_SC_ApprovedQty=0 OR eproject.PM_SC_ApprovedQty IS NULL) AND (eproject.PM_SC_PendingQty=0 OR eproject.PM_SC_PendingQty IS NULL) THEN 'A'
ELSE '' END) AS Scope,--Scope
eproject.ProjectControl_MOCFormNo,--MOC No.
eproject.ProjectControl_Account,--Account
ISNULL(eproject.ProjectControl_PVIPrediction,0) AS ProjectControl_PVIPrediction,--PVI Pre.
eproject.ProjectControl_CostEffectvitity,--Cost Eff.
eproject.ProjectControl_OperationRep,--Oper. Rep.
eproject.ProjectControl_CI_ProcessName,--Process Eng.
eproject.ProjectControl_CI_EquipmentName,--Equip. Eng.
eproject.ProjectControl_CI_InstrumentName,--Instr. Eng.
eproject.ProjectControl_CI_ElectricalName,--Elec. Eng.
eproject.ProjectControl_CI_CivilName,--Civil Eng.
eproject.PM_General_Category,--CATEGORY
eproject.PM_General_CDI,--PROJECT_CDI
CONVERT(NVARCHAR(10),(SELECT TOP 1 ReceiveHC FROM dbo.Editor_TDC WHERE [Type]='D01_IFC' AND Disc='00_ALL' AND EProjectId = eproject.EProjectId),23) AS IFC_Received,--IFC Received
CONVERT(NVARCHAR(10),(SELECT TOP 1 InputDate FROM dbo.Editor_TDC WHERE [Type]='D11_MC' AND Disc='00_ALL' AND EProjectId = eproject.EProjectId),23) AS MC_ReceivedDate,--MC Received Date
s.Detail_Eng_Civil_Sch_Start,--PROJ_DE_CIVIL_SCH_START_DATE
s.Detail_Eng_Civil_Sch_End,--PROJ_DE_CIVIL_SCH_END_DATE
s.PROJ_DE_CIVIL_ACU_START_DATE,--PROJ_DE_CIVIL_ACU_START_DATE
s.PROJ_DE_CIVIL_ACU_END_DATE,--PROJ_DE_CIVIL_ACU_END_DATE
s.Detail_Eng_Mech_EI_Sch_Start,--PROJ_DE_ME_SCH_START_DATE
s.PROJ_DE_ME_SCH_END_DATE,--PROJ_DE_ME_SCH_END_DATE
s.Detail_Eng_Mech_EI_Sch_End,--PROJ_DE_ME_ACU_START_DATE
s.PROJ_DE_ME_ACU_END_DATE, --PROJ_DE_ME_ACU_END_DATE
s.ProjectControl_LP_SchStart,--PROJ_DE_LLI_SCH_START_DATE
s.ProjectControl_LP_SchEnd,--PROJ_DE_LLI_SCH_END_DATE
s.PM_LLEP_RevisedStart,--PROJ_DE_LLI_ACU_START_DATE
s.PM_LLEP_RevisedEnd,--PROJ_DE_LLI_ACU_END_DATE
s.ProjectControl_CC_SchStart,--PROJ_CN_CIVIL_SCH_START_DATE
s.ProjectControl_CC_SchEnd,--PROJ_CN_CIVIL_SCH_END_DATE
s.CM_CC_RevisedStart,--PROJ_CN_CIVIL_ACU_START_DATE
s.CM_CC_RevisedEnd,--PROJ_CN_CIVIL_ACU_END_DATE
s.ProjectControl_CM_SchStart,--PROJ_CN_ME_SCH_START_DATE
s.ProjectControl_CM_SchEnd,--PROJ_CN_ME_SCH_END_DATE
s.CM_CM_RevisedStart,--PROJ_CN_ME_ACU_START_DATE
s.CM_CM_RevisedEnd,--PROJ_CN_ME_ACU_END_DATE
CONVERT(VARCHAR(10),eproject.CM_KickOffMetting,23) AS CM_KickOffMetting,
eproject.ProjectControl_Revised_MC_Date,--Revised MC Date
eproject.ProjectControl_Remarks, --Remarks
eproject.OutSourceType,
eproject.CM_Date_of_Registration,
eproject.CM_Punch_CKilledDate,
eproject.StudyWo,
eproject.CTEInvolved,
eproject.CAPEXPlanNo,
ISNULL(eproject.PM_SC_ApprovedQty,0) AS PM_SC_ApprovedQty,
ISNULL(eproject.PM_SC_ApprovedCost,0) AS PM_SC_ApprovedCost,
CONVERT(VARCHAR(10),eproject.PM_Planning_Approval,23) AS PM_Planning_Approval,
CONVERT(VARCHAR(10),eproject.PM_Pre_Approval,23) AS PM_Pre_Approval
FROM dbo.Editor_EProject AS eproject
LEFT JOIN dbo.View_ScheduleDate s ON s.EProjectId = eproject.EProjectId
GO

94
DataBase/版本日志/EProjectDB_2024-04-11sql.sql
View File

@ -1,94 +0,0 @@
ALTER PROCEDURE [dbo].[ProjectSchedule]
@EProjectId VARCHAR(50)
AS
/*********首页Schedule第一部分**********/
SELECT 1 AS id,
'Job Receive' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10),PM_MA_JobReveive, 23) IS NOT NULL THEN CONVERT(VARCHAR(10),PM_MA_JobReveive, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 2 AS id,
'Planning Cost Approval' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10),PM_Planning_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10),PM_Planning_Approval, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
--(CASE WHEN CONVERT(VARCHAR(10),eProject.ProjectControl_MS_ResourcePlanReceived,23) IS NOT NULL
--THEN CONVERT(VARCHAR(10),eProject.ProjectControl_MS_ResourcePlanReceived,23) ELSE 'N.A' END) AS Actual
--FROM dbo.Editor_EProject AS eProject
--WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 3 AS id,
'Pre-approval' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10),PM_Pre_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10),PM_Pre_Approval, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 4 AS id,
'Kick-off Meeting' AS MileSones,
'N.A' AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), PM_MA_KickOffMeeting, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_KickOffMeeting, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 5 AS id,
'SR1/2' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_MS_SR, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_SR, 23) ELSE 'N.A' END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), PM_MA_SR, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_SR, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 6 AS id,
'Final Approval' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Approval, 23) ELSE 'N.A' END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), PM_MA_ProjectApproval, 23) ELSE 'N.A' END) AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 7 AS id,
'MC' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23) IS NOT NULL AND ProjectControl_Revised_MC_Date=ProjectControl_MS_MC
THEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23)
ELSE CASE WHEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23) IS NOT NULL AND ProjectControl_Revised_MC_Date!=ProjectControl_MS_MC
THEN CONVERT(VARCHAR(10), ProjectControl_Revised_MC_Date, 23)+'*'
ELSE 'N.A' END END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), CM_MA_MC, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), CM_MA_MC, 23)ELSE 'N.A' END)AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 8 AS id,
'Close' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_MS_Close, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_MS_Close, 23) ELSE 'N.A' END) AS Schedule,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_ClosedDate, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_ClosedDate, 23) ELSE 'N.A' END)as Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
UNION
SELECT 9 AS id,
'Cancel' AS MileSones,
(CASE WHEN CONVERT(VARCHAR(10), ProjectControl_PC_CancelDate, 23) IS NOT NULL THEN CONVERT(VARCHAR(10), ProjectControl_PC_CancelDate, 23) ELSE 'N.A' END) AS Schedule,
'N.A' AS Actual
FROM dbo.Editor_EProject AS eProject
WHERE eProject.EProjectId=@EProjectId
GO

12
EProject/BLL/EditorManage/EProjectService.cs
View File

@ -97,6 +97,7 @@ namespace BLL
newEProject.ProjectControl_CM_SchEnd = eProject.ProjectControl_CM_SchEnd;
newEProject.ProjectControl_CM_Progress = eProject.ProjectControl_CM_Progress;
newEProject.ProjectControl_PC_CancelDate = eProject.ProjectControl_PC_CancelDate;
newEProject.Job_Hold=eProject.Job_Hold;
newEProject.ProjectControl_ProjectManagerId = eProject.ProjectControl_ProjectManagerId;
newEProject.ProjectControl_ConstManagerId = eProject.ProjectControl_ConstManagerId;
newEProject.ProjectControl_EMManagerId = eProject.ProjectControl_EMManagerId;
@ -193,6 +194,7 @@ namespace BLL
newEProject.ProjectControl_CM_SchEnd = eProject.ProjectControl_CM_SchEnd;
newEProject.ProjectControl_CM_Progress = eProject.ProjectControl_CM_Progress;
newEProject.ProjectControl_PC_CancelDate = eProject.ProjectControl_PC_CancelDate;
newEProject.Job_Hold=eProject.Job_Hold;
newEProject.ProjectControl_ProjectManagerId = eProject.ProjectControl_ProjectManagerId;
newEProject.ProjectControl_ConstManagerId = eProject.ProjectControl_ConstManagerId;
newEProject.ProjectControl_EMManagerId = eProject.ProjectControl_EMManagerId;
@ -207,6 +209,10 @@ namespace BLL
newEProject.StudyWo = eProject.StudyWo;
newEProject.CreateDate = eProject.CreateDate;
newEProject.CreatePerson = eProject.CreatePerson;
if (eProject.ProjectControl_JobStatus != "Hold")
{
newEProject.Job_Hold =null;
}
try
{
@ -357,7 +363,7 @@ namespace BLL
eproject.Job_Budget = ep.Job_Budget;
eproject.Job_EHSReview_Files = ep.Job_EHSReview_Files;
eproject.Job_Estimate_Worksheet = ep.Job_Estimate_Worksheet;
eproject.Job_Hold = ep.Job_Hold;
//eproject.Job_Hold = ep.Job_Hold;
eproject.Job_Plan_IFC = ep.Job_Plan_IFC;
eproject.Job_TecoAlarm_Study = ep.Job_TecoAlarm_Study;
eproject.Job_Delaybyteam1 = ep.Job_Delaybyteam1;
@ -402,6 +408,10 @@ namespace BLL
{
newEproject.ProjectControl_ClosedDate = eProject.ProjectControl_ClosedDate;
newEproject.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
if (eProject.ProjectControl_JobStatus != "Hold")
{
newEproject.Job_Hold = null;
}
Funs.DB.SubmitChanges();
}
}

4
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx
View File

@ -197,9 +197,7 @@
<Items>
<f:DatePicker ID="txtPlan_IFC" Label="Plan IFC" runat="server" LabelWidth="170px">
</f:DatePicker>
<f:DatePicker ID="txtHold" Label="Hold" runat="server"
LabelWidth="170px">
</f:DatePicker>
<f:Label runat="server"></f:Label>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>

4
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs
View File

@ -161,7 +161,7 @@ namespace FineUIPro.Web.EditorManage
txtBudget.Text = ep.Job_Budget == null ? "" : string.Format("{0:yyyy-MM-dd}", ep.Job_Budget);
txtTecoAlarm_Study.Text = ep.Job_TecoAlarm_Study == null ? "" : string.Format("{0:yyyy-MM-dd}", ep.Job_TecoAlarm_Study);
txtPlan_IFC.Text = ep.Job_Plan_IFC == null ? "" : string.Format("{0:yyyy-MM-dd}", ep.Job_Plan_IFC);
txtHold.Text = ep.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", ep.Job_Hold);
//txtHold.Text = ep.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", ep.Job_Hold);
if (!string.IsNullOrEmpty(ep.Job_Delaybyteam1))
{
@ -523,7 +523,7 @@ namespace FineUIPro.Web.EditorManage
eproject.Job_Budget = Funs.GetNewDateTime(this.txtBudget.Text.Trim());
eproject.Job_EHSReview_Files = Funs.GetNewDateTime(this.txtEHSReview_Files.Text.Trim());
eproject.Job_Estimate_Worksheet = Funs.GetNewDateTime(this.txtEstimate_Worksheet.Text.Trim());
eproject.Job_Hold = Funs.GetNewDateTime(this.txtHold.Text.Trim());
//eproject.Job_Hold = Funs.GetNewDateTime(this.txtHold.Text.Trim());
eproject.Job_Plan_IFC = Funs.GetNewDateTime(this.txtPlan_IFC.Text.Trim());
eproject.Job_TecoAlarm_Study = Funs.GetNewDateTime(this.txtTecoAlarm_Study.Text.Trim());
if (drpDelaybyteam1.SelectedValue != Const._Null)

185
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.EditorManage {
public partial class PMEditorEdit {
namespace FineUIPro.Web.EditorManage
{
public partial class PMEditorEdit
{
/// <summary>
/// _form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm _form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// gpPM 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel gpPM;
/// <summary>
/// GroupPanel1 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel1;
/// <summary>
/// Form2 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// drpPM_General_CDI 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPM_General_CDI;
/// <summary>
/// drpOutSourceType 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpOutSourceType;
/// <summary>
/// txtPM_General_CostToComplete 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPM_General_CostToComplete;
/// <summary>
/// drpPM_General_Category 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPM_General_Category;
/// <summary>
/// drpCritical 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCritical;
/// <summary>
/// drpReasonForCritical 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpReasonForCritical;
/// <summary>
/// GroupPanel17 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel17;
/// <summary>
/// Form18 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form18;
/// <summary>
/// Label6 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
/// <summary>
/// cbPM_PressureVessel 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbPM_PressureVessel;
/// <summary>
/// txtPM_PressureVessel 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_PressureVessel;
/// <summary>
/// Label7 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label7;
/// <summary>
/// cbPM_PressurePiping 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbPM_PressurePiping;
/// <summary>
/// txtPM_PressurePiping 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_PressurePiping;
/// <summary>
/// Label4 控件。
/// </summary>
@ -200,7 +202,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// cbPM_SQIB 控件。
/// </summary>
@ -209,7 +211,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbPM_SQIB;
/// <summary>
/// txtPM_SQIB 控件。
/// </summary>
@ -218,7 +220,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_SQIB;
/// <summary>
/// Label26 控件。
/// </summary>
@ -227,7 +229,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label26;
/// <summary>
/// GroupPanel8 控件。
/// </summary>
@ -236,7 +238,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel8;
/// <summary>
/// Form3 控件。
/// </summary>
@ -245,7 +247,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// txtPM_MA_JobReveive 控件。
/// </summary>
@ -254,7 +256,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_MA_JobReveive;
/// <summary>
/// txtPM_MA_KickOffMeeting 控件。
/// </summary>
@ -263,7 +265,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_MA_KickOffMeeting;
/// <summary>
/// txtPM_MA_SR 控件。
/// </summary>
@ -272,7 +274,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_MA_SR;
/// <summary>
/// txtPM_MA_ProjectApproval 控件。
/// </summary>
@ -281,7 +283,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_MA_ProjectApproval;
/// <summary>
/// txtPlanning_Approval 控件。
/// </summary>
@ -290,7 +292,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanning_Approval;
/// <summary>
/// txtPre_Approval 控件。
/// </summary>
@ -299,7 +301,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPre_Approval;
/// <summary>
/// GroupPanel2 控件。
/// </summary>
@ -308,7 +310,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel2;
/// <summary>
/// Form4 控件。
/// </summary>
@ -317,7 +319,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form4;
/// <summary>
/// txtPM_LLEP_RevisedStart 控件。
/// </summary>
@ -326,7 +328,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_LLEP_RevisedStart;
/// <summary>
/// cbLLEP_RevisedStart 控件。
/// </summary>
@ -335,7 +337,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbLLEP_RevisedStart;
/// <summary>
/// txtPM_LLEP_RevisedEnd 控件。
/// </summary>
@ -344,7 +346,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPM_LLEP_RevisedEnd;
/// <summary>
/// cbLLEP_RevisedEnd 控件。
/// </summary>
@ -353,7 +355,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbLLEP_RevisedEnd;
/// <summary>
/// txtPM_LLEP_ActualProgress 控件。
/// </summary>
@ -362,7 +364,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPM_LLEP_ActualProgress;
/// <summary>
/// GroupPanel3 控件。
/// </summary>
@ -371,7 +373,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel3;
/// <summary>
/// Form5 控件。
/// </summary>
@ -380,7 +382,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form5;
/// <summary>
/// txtStartDate 控件。
/// </summary>
@ -389,7 +391,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@ -398,7 +400,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// Label2 控件。
/// </summary>
@ -407,7 +409,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
@ -416,7 +418,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// GroupPanel6 控件。
/// </summary>
@ -425,7 +427,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel6;
/// <summary>
/// Form6 控件。
/// </summary>
@ -434,7 +436,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form6;
/// <summary>
/// txtPlanEHSReview_Files 控件。
/// </summary>
@ -443,7 +445,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanEHSReview_Files;
/// <summary>
/// txtEHSReview_Files 控件。
/// </summary>
@ -452,7 +454,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEHSReview_Files;
/// <summary>
/// txtEHSReview_Files_Meeting 控件。
/// </summary>
@ -461,7 +463,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEHSReview_Files_Meeting;
/// <summary>
/// txtEstimate_Worksheet 控件。
/// </summary>
@ -470,7 +472,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEstimate_Worksheet;
/// <summary>
/// txtBudget 控件。
/// </summary>
@ -479,7 +481,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtBudget;
/// <summary>
/// txtTecoAlarm_Study 控件。
/// </summary>
@ -488,7 +490,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtTecoAlarm_Study;
/// <summary>
/// txtPlan_IFC 控件。
/// </summary>
@ -497,16 +499,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlan_IFC;
/// <summary>
/// txtHold 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtHold;
/// <summary>
/// drpDelaybyteam1 控件。
/// </summary>
@ -515,7 +508,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelaybyteam1;
/// <summary>
/// drpDelaybypersonel1 控件。
/// </summary>
@ -524,7 +517,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelaybypersonel1;
/// <summary>
/// txtRemark1 控件。
/// </summary>
@ -533,7 +526,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark1;
/// <summary>
/// drpDelaybyteam2 控件。
/// </summary>
@ -542,7 +535,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelaybyteam2;
/// <summary>
/// drpDelaybypersonel2 控件。
/// </summary>
@ -551,7 +544,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelaybypersonel2;
/// <summary>
/// txtRemark2 控件。
/// </summary>
@ -560,7 +553,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark2;
/// <summary>
/// drpDelaybyteam3 控件。
/// </summary>
@ -569,7 +562,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelaybyteam3;
/// <summary>
/// drpDelaybypersonel3 控件。
/// </summary>
@ -578,7 +571,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelaybypersonel3;
/// <summary>
/// txtRemark3 控件。
/// </summary>
@ -587,7 +580,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark3;
/// <summary>
/// GroupPanel5 控件。
/// </summary>
@ -596,7 +589,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel5;
/// <summary>
/// Panel5 控件。
/// </summary>
@ -605,7 +598,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel5;
/// <summary>
/// txtPM_Remarks_Engineering 控件。
/// </summary>
@ -614,7 +607,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtPM_Remarks_Engineering;
/// <summary>
/// Panel2 控件。
/// </summary>
@ -623,7 +616,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label5 控件。
/// </summary>
@ -632,7 +625,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
/// <summary>
/// lblCMProcurement 控件。
/// </summary>
@ -641,7 +634,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblCMProcurement;
/// <summary>
/// Panel6 控件。
/// </summary>
@ -650,7 +643,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// txtPM_Remarks_Procurement 控件。
/// </summary>
@ -659,7 +652,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtPM_Remarks_Procurement;
/// <summary>
/// gpEM 控件。
/// </summary>
@ -668,7 +661,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel gpEM;
/// <summary>
/// Panel8 控件。
/// </summary>
@ -677,7 +670,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel8;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -686,7 +679,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// SchStart 控件。
/// </summary>
@ -695,7 +688,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker SchStart;
/// <summary>
/// SchEnd 控件。
/// </summary>
@ -704,7 +697,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker SchEnd;
/// <summary>
/// RevisedStart 控件。
/// </summary>
@ -713,7 +706,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker RevisedStart;
/// <summary>
/// RevisedEnd 控件。
/// </summary>
@ -722,7 +715,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker RevisedEnd;
/// <summary>
/// lblActual_IFC 控件。
/// </summary>
@ -731,7 +724,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblActual_IFC;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -740,7 +733,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnCalculated 控件。
/// </summary>
@ -749,7 +742,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCalculated;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -758,7 +751,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>

22
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
View File

@ -201,7 +201,7 @@
</f:GroupPanel>
<f:Panel runat="server" Layout="HBox" ShowHeader="false" ShowBorder="false">
<Items>
<f:GroupPanel ID="GroupPanel8" Title="Business Closure" runat="server" EnableCollapse="true" Width="400px">
<f:GroupPanel ID="GroupPanel8" Title="Business Closure" runat="server" EnableCollapse="true" Width="300px">
<Items>
<f:Form ID="Form9" ShowBorder="false" ShowHeader="false" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
@ -217,7 +217,7 @@
</Items>
</f:GroupPanel>
<f:Label runat="server" Width="10px"></f:Label>
<f:GroupPanel ID="GroupPanel10" Title="Project Cancel" runat="server" EnableCollapse="true" Width="400px">
<f:GroupPanel ID="GroupPanel10" Title="Project Cancel" runat="server" EnableCollapse="true" Width="300px">
<Items>
<f:Form ID="Form10" ShowBorder="false" ShowHeader="false" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
@ -225,7 +225,6 @@
<f:FormRow>
<Items>
<f:DatePicker ID="txtCancelDate" runat="server" Label="Cancel Date" LabelWidth="120px" ></f:DatePicker>
</Items>
</f:FormRow>
</Rows>
@ -233,7 +232,22 @@
</Items>
</f:GroupPanel>
<f:Label runat="server" Width="10px"></f:Label>
<f:GroupPanel ID="GroupPanel9" runat="server" EnableCollapse="true" Width="400px">
<f:GroupPanel ID="GroupPanel11" Title="Project Hold" runat="server" EnableCollapse="true" Width="300px">
<Items>
<f:Form ID="Form13" ShowBorder="false" ShowHeader="false" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:DatePicker ID="txtHold" runat="server" Label="Hold Date" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:Label runat="server" Width="10px"></f:Label>
<f:GroupPanel ID="GroupPanel9" runat="server" EnableCollapse="true" Width="300px">
<Items>
<f:Form ID="Form11" ShowBorder="false" ShowHeader="false" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">

17
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
View File

@ -173,6 +173,7 @@ namespace FineUIPro.Web.EditorManage
this.txtBC_CloseDate.Text = eproject.ProjectControl_BC_CloseDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_BC_CloseDate);
this.txtCancelDate.Text = eproject.ProjectControl_PC_CancelDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_PC_CancelDate);
this.txtHold.Text = eproject.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.Job_Hold);
this.txtCAPEXPlanNo.Text = eproject.CAPEXPlanNo;
this.txtStudyWo.Text = eproject.StudyWo;
this.drpCTEInvolved.SelectedValue = eproject.CTEInvolved;
@ -541,6 +542,7 @@ namespace FineUIPro.Web.EditorManage
eProject.ProjectControl_MS_Approval = Funs.GetNewDateTime(this.txtMS_Approval.Text.Trim());
eProject.ProjectControl_MS_MC = Funs.GetNewDateTime(this.txtMS_MC.Text.Trim());
eProject.ProjectControl_MS_Close = Funs.GetNewDateTime(this.txtMS_Close.Text.Trim());
eProject.Job_Hold = Funs.GetNewDateTime(this.txtHold.Text.Trim());
eProject.PM_SC_ApprovedQty = Funs.GetNewInt(txtPM_SC_ApprovedQty.Text.Trim());
eProject.PM_SC_ApprovedCost = Funs.GetNewDecimal(txtPM_SC_ApprovedCost.Text.Trim());
@ -679,6 +681,10 @@ namespace FineUIPro.Web.EditorManage
{
operationLog += "Cancel Date 由" + (pro.ProjectControl_PC_CancelDate == null ? "" : string.Format("{0:yyyy-MM-dd}", pro.ProjectControl_PC_CancelDate)) + "修改为" + this.txtCancelDate.Text.Trim() + "，";
}
if (pro.Job_Hold != Funs.GetNewDateTime(this.txtHold.Text.Trim()))
{
operationLog += "Hold Date 由" + (pro.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", pro.Job_Hold)) + "修改为" + this.txtHold.Text.Trim() + "，";
}
if (pro.ProjectControl_MS_ResourcePlanReceived != Funs.GetNewDateTime(this.txtResourcePlanReceived.Text.Trim()))
{
operationLog += "Resource Plan Received 由" + (pro.ProjectControl_MS_ResourcePlanReceived == null ? "" : string.Format("{0:yyyy-MM-dd}", pro.ProjectControl_MS_ResourcePlanReceived)) + "修改为" + this.txtResourcePlanReceived.Text.Trim() + "，";
@ -1030,6 +1036,11 @@ namespace FineUIPro.Web.EditorManage
{
eproject.ProjectControl_JobStatus = "Cancelled";
}
if (!string.IsNullOrEmpty(this.txtHold.Text))//Hold Date有输入时,状态为Hold
{
eproject.ProjectControl_JobStatus = "Hold";
}
if (pro.ProjectControl_JobStatus != eproject.ProjectControl_JobStatus)
{
operationLog += "Job Status 由" + pro.ProjectControl_JobStatus + "修改为" + eproject.ProjectControl_JobStatus + "，";
@ -1039,10 +1050,10 @@ namespace FineUIPro.Web.EditorManage
eproject.EProjectId = eProject.EProjectId;
BLL.EProjectService.UpdateProjectJobStatus(eproject);
// 当eproject状态为Cancelled或Hold时更新人工时状态
if (eproject.ProjectControl_JobStatus == "Cancelled" || eproject.ProjectControl_JobStatus == "Hold")
// 当eproject状态为Cancelled或Hold时更新人工时状态: 如日期不为空改为一个月后触发状态
if ((eproject.ProjectControl_JobStatus == "Cancelled" && !eproject.ProjectControl_PC_CancelDate.HasValue) || (eproject.ProjectControl_JobStatus == "Hold" && !eproject.Job_Hold.HasValue))
{
var updatePlan = Funs.DB.ManHours_Plan.Where(x => x.EProjectId == eProject.EProjectId);
if (updatePlan != null)

213
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.EditorManage {
public partial class ProjectControlEditorEdit {
namespace FineUIPro.Web.EditorManage
{
public partial class ProjectControlEditorEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// GroupPanel1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel1;
/// <summary>
/// Form2 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtJobNo 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobNo;
/// <summary>
/// txtNotesLink 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtNotesLink;
/// <summary>
/// drpProjectManager 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectManager;
/// <summary>
/// txtAccount 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAccount;
/// <summary>
/// drpJobType 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJobType;
/// <summary>
/// txtFilesLink 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFilesLink;
/// <summary>
/// drpEMManager 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpEMManager;
/// <summary>
/// txtNetworkNo 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtNetworkNo;
/// <summary>
/// drpJobStatus 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJobStatus;
/// <summary>
/// txtOrginalBudget 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtOrginalBudget;
/// <summary>
/// drpConstManager 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpConstManager;
/// <summary>
/// txtMOCFormNO 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMOCFormNO;
/// <summary>
/// txtJobTitle 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobTitle;
/// <summary>
/// txtCostEffectvitity 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCostEffectvitity;
/// <summary>
/// drpLeadBy 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpLeadBy;
/// <summary>
/// txtCAPEXPlanNo 控件。
/// </summary>
@ -200,7 +202,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCAPEXPlanNo;
/// <summary>
/// drpBuCode 控件。
/// </summary>
@ -209,7 +211,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBuCode;
/// <summary>
/// txtPVIPrediction 控件。
/// </summary>
@ -218,7 +220,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPVIPrediction;
/// <summary>
/// drpOpre 控件。
/// </summary>
@ -227,7 +229,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpOpre;
/// <summary>
/// txtStudyWo 控件。
/// </summary>
@ -236,7 +238,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtStudyWo;
/// <summary>
/// drpCTEInvolved 控件。
/// </summary>
@ -245,7 +247,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCTEInvolved;
/// <summary>
/// txtRevisedMCDate 控件。
/// </summary>
@ -254,7 +256,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtRevisedMCDate;
/// <summary>
/// drpPM_General_Priority 控件。
/// </summary>
@ -263,7 +265,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPM_General_Priority;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -272,7 +274,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// GroupPanel2 控件。
/// </summary>
@ -281,7 +283,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel2;
/// <summary>
/// Form3 控件。
/// </summary>
@ -290,7 +292,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// txtLPSchStart 控件。
/// </summary>
@ -299,7 +301,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLPSchStart;
/// <summary>
/// txtLPSchEnd 控件。
/// </summary>
@ -308,7 +310,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLPSchEnd;
/// <summary>
/// txtLPProgress 控件。
/// </summary>
@ -317,7 +319,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtLPProgress;
/// <summary>
/// Label1 控件。
/// </summary>
@ -326,7 +328,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// GroupPanel3 控件。
/// </summary>
@ -335,7 +337,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel3;
/// <summary>
/// Form4 控件。
/// </summary>
@ -344,7 +346,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form4;
/// <summary>
/// txtCCSchStart 控件。
/// </summary>
@ -353,7 +355,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCCSchStart;
/// <summary>
/// txtCCSchEnd 控件。
/// </summary>
@ -362,7 +364,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCCSchEnd;
/// <summary>
/// txtCCProgress 控件。
/// </summary>
@ -371,7 +373,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCCProgress;
/// <summary>
/// Label10 控件。
/// </summary>
@ -380,7 +382,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label10;
/// <summary>
/// GroupPanel4 控件。
/// </summary>
@ -389,7 +391,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel4;
/// <summary>
/// Form5 控件。
/// </summary>
@ -398,7 +400,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form5;
/// <summary>
/// txtCMSchStart 控件。
/// </summary>
@ -407,7 +409,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCMSchStart;
/// <summary>
/// txtCMSchEnd 控件。
/// </summary>
@ -416,7 +418,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCMSchEnd;
/// <summary>
/// txtCMProgress 控件。
/// </summary>
@ -425,7 +427,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCMProgress;
/// <summary>
/// Label11 控件。
/// </summary>
@ -434,7 +436,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label11;
/// <summary>
/// GroupPanel5 控件。
/// </summary>
@ -443,7 +445,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel5;
/// <summary>
/// Form6 控件。
/// </summary>
@ -452,7 +454,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form6;
/// <summary>
/// drpCIProcess 控件。
/// </summary>
@ -461,7 +463,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCIProcess;
/// <summary>
/// drpEquipment 控件。
/// </summary>
@ -470,7 +472,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpEquipment;
/// <summary>
/// drpInstrument 控件。
/// </summary>
@ -479,7 +481,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstrument;
/// <summary>
/// drpElectrical 控件。
/// </summary>
@ -488,7 +490,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpElectrical;
/// <summary>
/// drpCivil 控件。
/// </summary>
@ -497,7 +499,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCivil;
/// <summary>
/// GroupPanel6 控件。
/// </summary>
@ -506,7 +508,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel6;
/// <summary>
/// Form7 控件。
/// </summary>
@ -515,7 +517,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form7;
/// <summary>
/// txtChangedBudget 控件。
/// </summary>
@ -524,7 +526,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtChangedBudget;
/// <summary>
/// txtCommitted_PRPO 控件。
/// </summary>
@ -533,7 +535,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCommitted_PRPO;
/// <summary>
/// txtCommitted_SSRs 控件。
/// </summary>
@ -542,7 +544,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCommitted_SSRs;
/// <summary>
/// txtActual 控件。
/// </summary>
@ -551,7 +553,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtActual;
/// <summary>
/// GroupPanel7 控件。
/// </summary>
@ -560,7 +562,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel7;
/// <summary>
/// Form8 控件。
/// </summary>
@ -569,7 +571,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form8;
/// <summary>
/// txtMS_SR 控件。
/// </summary>
@ -578,7 +580,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMS_SR;
/// <summary>
/// txtMS_Approval 控件。
/// </summary>
@ -587,7 +589,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMS_Approval;
/// <summary>
/// txtMS_MC 控件。
/// </summary>
@ -596,7 +598,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMS_MC;
/// <summary>
/// txtMS_Close 控件。
/// </summary>
@ -605,7 +607,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMS_Close;
/// <summary>
/// GroupPanel15 控件。
/// </summary>
@ -614,7 +616,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel15;
/// <summary>
/// Form12 控件。
/// </summary>
@ -623,7 +625,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form12;
/// <summary>
/// txtPM_SC_ApprovedQty 控件。
/// </summary>
@ -632,7 +634,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPM_SC_ApprovedQty;
/// <summary>
/// txtPM_SC_ApprovedCost 控件。
/// </summary>
@ -641,7 +643,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPM_SC_ApprovedCost;
/// <summary>
/// txtPM_SC_PendingQty 控件。
/// </summary>
@ -650,7 +652,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPM_SC_PendingQty;
/// <summary>
/// txtPM_SC_PendingCost 控件。
/// </summary>
@ -659,7 +661,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPM_SC_PendingCost;
/// <summary>
/// GroupPanel8 控件。
/// </summary>
@ -668,7 +670,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel8;
/// <summary>
/// Form9 控件。
/// </summary>
@ -677,7 +679,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form9;
/// <summary>
/// txtBC_CloseDate 控件。
/// </summary>
@ -686,7 +688,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtBC_CloseDate;
/// <summary>
/// GroupPanel10 控件。
/// </summary>
@ -695,7 +697,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel10;
/// <summary>
/// Form10 控件。
/// </summary>
@ -704,7 +706,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form10;
/// <summary>
/// txtCancelDate 控件。
/// </summary>
@ -713,7 +715,34 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCancelDate;
/// <summary>
/// GroupPanel11 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel11;
/// <summary>
/// Form13 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form13;
/// <summary>
/// txtHold 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtHold;
/// <summary>
/// GroupPanel9 控件。
/// </summary>
@ -722,7 +751,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel GroupPanel9;
/// <summary>
/// Form11 控件。
/// </summary>
@ -731,7 +760,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form11;
/// <summary>
/// txtResourcePlanReceived 控件。
/// </summary>
@ -740,7 +769,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtResourcePlanReceived;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -749,7 +778,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAccount 控件。
/// </summary>
@ -758,7 +787,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAccount;
/// <summary>
/// hdNetworkDate 控件。
/// </summary>
@ -767,7 +796,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdNetworkDate;
/// <summary>
/// btnEmail 控件。
/// </summary>
@ -776,7 +805,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnEmail;
/// <summary>
/// btnCalculated 控件。
/// </summary>
@ -785,7 +814,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCalculated;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -794,7 +823,7 @@ namespace FineUIPro.Web.EditorManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>

1536
EProject/FineUIPro.Web/ErrLog.txt
View File

File diff suppressed because it is too large Load Diff

BIN
EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx
View File

Binary file not shown.

16
EProject/FineUIPro.Web/Global.asax.cs
View File

@ -327,7 +327,7 @@
}
#endregion
#region 填写第二张资源时，第一张资源预留一个月的时候填写人工时
#region 1、填写第二张资源时，第一张资源预留一个月的时候填写人工时 2、Cancelled或Hold也预留一个月
/// <summary>
/// 填写第二张资源时，第一张资源预留一个月的时候填写人工时
/// </summary>
@ -355,6 +355,20 @@
}
}
}
var epList=from x in Funs.DB.Editor_EProject
where (x.ProjectControl_PC_CancelDate.HasValue && x.ProjectControl_PC_CancelDate.Value.AddMonths(1) <= DateTime.Now && x.ProjectControl_PC_CancelDate.Value.AddMonths(2) >= DateTime.Now)
|| (x.Job_Hold.HasValue && x.Job_Hold.Value.AddMonths(1)<= DateTime.Now && x.Job_Hold.Value.AddMonths(2) >= DateTime.Now)
select x;
foreach (var ep in epList)
{
var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.EProjectId == ep.EProjectId);
if (manHours_Plan != null)
{
manHours_Plan.AccountDisabled = 1;
Funs.DB.SubmitChanges();
}
}
}
#endregion

8
EProject/FineUIPro.Web/ManHours/SelectPlan.aspx.cs
View File

@ -55,9 +55,11 @@ namespace FineUIPro.Web.ManHours
string strSql = @"SELECT * from View_NewManHours_Plan
WHERE AccountDisabled=0 and IsCalculated=1
AND (ProjectControl_JobStatus='Detail Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
OR ProjectControl_JobStatus='Study' OR ProjectControl_JobStatus='Not Start' OR ProjectControl_JobStatus='On Going'
OR (ProjectControl_JobStatus='Cancelled' and datediff(MONTH,ProjectControl_PC_CancelDate,GETDATE())<=3)
OR (ProjectControl_JobStatus='MC' and datediff(MONTH,CM_MA_MC,GETDATE())<=4))";
OR ProjectControl_JobStatus='Not Start' OR ProjectControl_JobStatus='On Going'
OR (ProjectControl_JobStatus='Cancelled' AND DATEDIFF(DAY,ProjectControl_PC_CancelDate,GETDATE())<=31)
OR (ProjectControl_JobStatus='MC' and DATEDIFF(MONTH,CM_MA_MC,GETDATE())<=4)
OR (ProjectControl_JobStatus='Study' and (DATEDIFF(DAY,PM_MA_ProjectApproval,GETDATE())<=31 OR PM_MA_ProjectApproval IS NULL))
OR (ProjectControl_JobStatus='Hold' and DATEDIFF(DAY,Job_Hold,GETDATE())<=31))";
// 暂不加
// OR (AccountDisabled=1 AND (ProjectControl_JobType='Projects' OR ProjectControl_JobType='Small Invest')
// AND(ProjectControl_NetworkDate IS NOT NULL AND DATEDIFF(DAY, ProjectControl_NetworkDate, GETDATE()) <= 30))

3
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs
View File

@ -1380,6 +1380,9 @@ namespace FineUIPro.Web.Report
projectList.GetRow(rowIndex).GetCell(72).SetCellValue((DateTime)Convert.ToDateTime(itemOver.PM_Pre_Approval));
projectList.GetRow(rowIndex).GetCell(72).CellStyle = styleDate;
}
if (projectList.GetRow(rowIndex).GetCell(73) == null) projectList.GetRow(rowIndex).CreateCell(73);
projectList.GetRow(rowIndex).GetCell(73).SetCellValue(itemOver.Job_Hold);
projectList.GetRow(rowIndex).GetCell(73).CellStyle = styleQfw;
#endregion

35
EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs
View File

@ -283,7 +283,40 @@ namespace FineUIPro.Web.Report
reportModel.GetRow(rowIndex).GetCell(5).CellStyle = styleCenter;
//Act. Type
if (reportModel.GetRow(rowIndex).GetCell(6) == null) reportModel.GetRow(rowIndex).CreateCell(6);
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(table.Rows[i]["ActType"].ToString());
if (table.Rows[i]["Type"].ToString().Contains("T01_OverTime"))
{
string actType = table.Rows[i]["ActType"].ToString();
if (actType.Contains("2"))
{
string actStr = actType + "1";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T02_OverTime"))
{
string actType = table.Rows[i]["ActType"].ToString();
if (actType.Contains("2"))
{
string actStr = actType + "2";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T03_OverTime"))
{
string actType = table.Rows[i]["ActType"].ToString();
if (actType.Contains("2"))
{
string actStr = actType + "3";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
else
{
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(table.Rows[i]["ActType"].ToString());
}
reportModel.GetRow(rowIndex).GetCell(6).CellStyle = styleCenter;
//Hours
if (!string.IsNullOrEmpty(table.Rows[i]["Hours"].ToString()))

19
EProject/FineUIPro.Web/common/Main.aspx.cs
View File

@ -769,13 +769,18 @@ namespace FineUIPro.Web.common
if (row["AccountDisabled"].ToString() != string.Empty)
{
bool validity = Convert.ToBoolean(row["AccountDisabled"]);
string state = string.Empty;
if (row["ProjectControl_JobStatus"] != null && row["ProjectControl_JobStatus"].ToString() != "")
{
state = row["ProjectControl_JobStatus"].ToString();
}
if (validity || state== "Cancelled" || state== "Hold")
//string state = string.Empty;
//if (row["ProjectControl_JobStatus"] != null && row["ProjectControl_JobStatus"].ToString() != "")
//{
// state = row["ProjectControl_JobStatus"].ToString();
//}
string eprojectId= row["EProjectId"].ToString();
var ep = from x in Funs.DB.Editor_EProject
where x.EProjectId==eprojectId &&
((x.ProjectControl_PC_CancelDate.HasValue && x.ProjectControl_PC_CancelDate.Value.AddMonths(1) <= DateTime.Now)
|| (x.Job_Hold.HasValue && x.Job_Hold.Value.AddMonths(1) <= DateTime.Now))
select x;
if (validity || ep.Count()>0)
{
e.RowCssClass = "color1";
}

54
EProject/Model/Model.cs
View File

@ -26917,6 +26917,10 @@ namespace Model
private System.Nullable<System.DateTime> _CM_MA_MC;
private System.Nullable<System.DateTime> _Job_Hold;
private System.Nullable<System.DateTime> _PM_MA_ProjectApproval;
private string _EngineerName;
private string _DepartId;
@ -27223,6 +27227,38 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Job_Hold", DbType="DateTime")]
public System.Nullable<System.DateTime> Job_Hold
{
get
{
return this._Job_Hold;
}
set
{
if ((this._Job_Hold != value))
{
this._Job_Hold = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PM_MA_ProjectApproval", DbType="DateTime")]
public System.Nullable<System.DateTime> PM_MA_ProjectApproval
{
get
{
return this._PM_MA_ProjectApproval;
}
set
{
if ((this._PM_MA_ProjectApproval != value))
{
this._PM_MA_ProjectApproval = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EngineerName", DbType="NVarChar(20)")]
public string EngineerName
{
@ -27843,6 +27879,8 @@ namespace Model
private string _PM_Pre_Approval;
private string _Job_Hold;
public View_ProjectListReport()
{
}
@ -29062,6 +29100,22 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Job_Hold", DbType="VarChar(10)")]
public string Job_Hold
{
get
{
return this._Job_Hold;
}
set
{
if ((this._Job_Hold != value))
{
this._Job_Hold = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Punch")]