diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo index 6b7a5a4a..a10de9ee 100644 Binary files a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo and b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo differ diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json new file mode 100644 index 00000000..377abef3 --- /dev/null +++ b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json @@ -0,0 +1,79 @@ +{ + "Version": 1, + "WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u4E94\u73AF\\CNCEC_SUBQHSE_WUHUAN\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 1, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedHeight": 200, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}" + }, + { + "$type": "Bookmark", + "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}" + }, + { + "$type": "Bookmark", + "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-19-bwj.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-19-bwj.sql new file mode 100644 index 00000000..ba882d5f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-19-bwj.sql @@ -0,0 +1,62 @@ + + +ALTER VIEW [dbo].[View_Check_JointCheckDetail] +AS + +SELECT d.JointCheckDetailId,d.JointCheckId, d.UnitWorkId, d.CNProfessionalCode, d.QuestionDef, d.QuestionType,d.CheckSite, + d.Standard,d.RectifyOpinion,d.LimitDate,d.AttachUrl,d.HandleWay,d.RectifyDate,d.ReAttachUrl,d.Feedback,d.IsOK, + c.ProjectId,c.CheckType,c.UnitId,u.UnitName,c.CheckDate,d.State,d.CreateDate,d.HandleMan,SaveHandleMan, + case d.State when '6' then 1 + else 0 end as OK, + case c.CheckType when '1' then 'ܼ' + when '2' then '¼' + when '3' then 'ڼ' + when '4' then 'רҵ' + else '' end as CheckTypeStr, + --case d.QuestionType when '1' then 'ϸ' + -- when '2' then 'ȱ' + -- else '' end as QuestionTypeStr, + qqt.QualityQuestionType as QuestionTypeStr, + pu.UnitName as ProposeUnitName, + ppu.UnitType as ProposeUnitType, + (select top 1 ApproveDate from dbo.Check_JointCheckApprove jca where jca.JointCheckDetailId=d.JointCheckDetailId + order by ApproveDate desc) as OKDate, + uw.UnitWorkName,cn.ProfessionalName +FROM dbo.Check_JointCheckDetail AS d + LEFT JOIN dbo.Check_JointCheck AS c ON c.JointCheckId = d.JointCheckId + LEFT JOIN dbo.Base_Unit AS u ON u.UnitId = c.UnitId + LEFT JOIN dbo.WBS_UnitWork as uw on uw.UnitWorkId=d.UnitWorkId + LEFT JOIN dbo.Base_CNProfessional as cn on cn.CNProfessionalId=d.CNProfessionalCode + LEFT JOIN dbo.Base_Unit AS pu ON pu.UnitId = c.ProposeUnitId + LEFT JOIN dbo.Project_ProjectUnit AS ppu ON ppu.UnitId = c.ProposeUnitId and ppu.ProjectId=c.ProjectId + LEFT JOIN dbo.Base_QualityQuestionType AS qqt ON qqt.QualityQuestionTypeId = d.QuestionType +union +(SELECT d.CheckControlCode,'', d.UnitWorkId, d.CNProfessionalCode, d.QuestionDef, d.QuestionType,d.CheckSite, + '',d.RectifyOpinion,d.LimitDate,d.AttachUrl,d.HandleWay,d.RectifyDate,d.ReAttachUrl,null,null, + d.ProjectId,'5',d.UnitId,u.UnitName,d.CheckDate,d.State,d.CheckDate,'','', + case d.State when '7' then 1 + else 0 end as OK, + 'Ѳ' as CheckTypeStr, + --case d.QuestionType when '1' then 'ϸ' + -- when '2' then 'ȱ' + -- else '' end as QuestionTypeStr, + qqt.QualityQuestionType as QuestionTypeStr, + pu.UnitName as ProposeUnitName, + ppu.UnitType as ProposeUnitType, + (select top 1 ApproveDate from dbo.Check_CheckControlApprove cca where cca.CheckControlCode=d.CheckControlCode + order by ApproveDate desc) as OKDate, + uw.UnitWorkName,cn.ProfessionalName +FROM dbo.Check_CheckControl AS d + LEFT JOIN dbo.Base_Unit AS u ON u.UnitId = d.UnitId + LEFT JOIN dbo.WBS_UnitWork as uw on uw.UnitWorkId=d.UnitWorkId + LEFT JOIN dbo.Base_CNProfessional as cn on cn.CNProfessionalId=d.CNProfessionalCode + LEFT JOIN dbo.Base_Unit AS pu ON pu.UnitId = d.ProposeUnitId + LEFT JOIN dbo.Project_ProjectUnit AS ppu ON ppu.UnitId = d.ProposeUnitId and ppu.ProjectId=d.ProjectId + LEFT JOIN dbo.Base_QualityQuestionType AS qqt ON qqt.QualityQuestionTypeId = d.QuestionType +) + + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-20-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-20-phf.sql new file mode 100644 index 00000000..f5292dd8 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-20-phf.sql @@ -0,0 +1,21 @@ +--±²˵ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('9E4B28DF-8C8E-49F8-AB15-270BBDC73449','HSE±()','HSSE/Manager/ManagerMonthCNew.aspx',4,'03235B30-960D-4FCF-99F7-97773A2EE108','Menu_HSSE',0,1,1) +; +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('9C646F93-1748-44E7-83B9-392415442AD9','9E4B28DF-8C8E-49F8-AB15-270BBDC73449','',1); +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('BD82E934-B195-4A31-A357-DC2FBD3441EF','9E4B28DF-8C8E-49F8-AB15-270BBDC73449','޸',2); +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('6F77EA4D-1D58-4617-A07F-78F2DECF07BB','9E4B28DF-8C8E-49F8-AB15-270BBDC73449','ɾ',3); +insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('63209F98-49D2-49BB-9FF7-46C5A6C9BD53','9E4B28DF-8C8E-49F8-AB15-270BBDC73449','',4); + +alter table Manager_MonthReportC +add StartDate datetime null; + +alter table Manager_MonthReportC +add EndDate datetime null; + +alter table Manager_MonthReportC +add TotalHseManhoursYear int null; \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-21-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-21-phf.sql new file mode 100644 index 00000000..f833e770 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-21-phf.sql @@ -0,0 +1,16 @@ + +--增加索引 +CREATE NONCLUSTERED INDEX [t_d_EmployInOutRecord_ProjectId_Index] +ON [dbo].[t_d_EmployInOutRecord] ([ProjectId]) +INCLUDE ([ManHours]); + +CREATE NONCLUSTERED INDEX [SitePerson_Person_Pid_Wid_IsUsed_Intime_Index] +ON [dbo].[SitePerson_Person] ([ProjectId],[WorkPostId],[IsUsed],[InTime],[OutTime]); + +CREATE NONCLUSTERED INDEX [Sys_CodeRecords_ProjectId_MenuId_Index] +ON [dbo].[Sys_CodeRecords] ([ProjectId],[MenuId]) +INCLUDE ([DataId],[UnitId],[CompileDate],[SortIndex],[RuleCodes],[Digit],[Code],[OwnerRuleCodes],[OwerDigit],[OwnerCode]); + +CREATE NONCLUSTERED INDEX [Sys_FlowOperate_OperaterId_IsClosed_Index] +ON [dbo].[Sys_FlowOperate] ([OperaterId],[IsClosed]) +INCLUDE ([DataId]); diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql new file mode 100644 index 00000000..93a9e8db --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-23-phf.sql @@ -0,0 +1,22 @@ +--ȫ±ӱ +alter table Manager_MonthReportC +add MonthHdangerCount int null; + +alter table Manager_MonthReportC +add YearHdangerCount int null; + +--Manager_HiddenDanger +CREATE TABLE [dbo].[Manager_HiddenDanger]( + [Id] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [UnitId] [nvarchar](50) NULL, + [CommonlyNum] [int] NULL, + [MajorNum] [int] NULL, + [ReRate] [nvarchar](50) NULL, + [SortIndex] [int] NULL, + CONSTRAINT [PK_Manager_HiddenDanger] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY]; + diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-26-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-26-phf.sql new file mode 100644 index 00000000..3fb902bb --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-26-phf.sql @@ -0,0 +1,88 @@ +--Manager_ProjectAssignment±Ŀҵɹ +CREATE TABLE [dbo].[Manager_ProjectAssignment]( + [Id] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [FireWorkCount] [int] NULL, + [BreakGroundCount] [int] NULL, + [LimitedSpaceCount] [int] NULL, + [ElectricityCount] [int] NULL, + [HeightWorkCount] [int] NULL, + [RadialWork] [int] NULL, + [LiftingWorkCount] [int] NULL, + [NightWork] [int] NULL, + [MonthCount] [int] NULL, + [YearCount] [int] NULL, + [ProCount] [int] NULL, + CONSTRAINT [PK_Manager_ProjectAssignment] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY]; + +--Ӿר֤ijΣ󹤳 +alter table Manager_MonthReportC +add MonthExpertCount int null; + +--ӷǾר֤Σ󹤳 +alter table Manager_MonthReportC +add MonthExpertNoCount int null; + +--ӦԤManager_EmergencyPlan +CREATE TABLE [dbo].[Manager_EmergencyPlan]( + [Id] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [CaType] [nvarchar](50) NULL, + [MonthCount] [int] NULL, + [YearCount] [int] NULL, + [ProCount] [int] NULL, + [SortIndex] [int] NULL, + CONSTRAINT [PK_Manager_EmergencyPlan] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY]; + +--Ӧ˵ +CREATE TABLE [dbo].[Manager_DrillRecordList]( + [Id] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [Dname] [nvarchar](100) NULL, + [Ddate] [datetime] NULL, + [DrillRecordTypeName] [nvarchar](50) NULL, + [PersonNum] [int] NULL, + [DrillCost] [decimal](18, 2) NULL, + [SortIndex] [int] NULL, + CONSTRAINT [PK_Manager_DrillRecordList] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +--δ¼ͳ +CREATE TABLE [dbo].[Manager_Attempted]( + [Id] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [WhMonthNum] [int] NULL, + [WhYearNum] [int] NULL, + [FbsMonthNum] [int] NULL, + [FbsYearNum] [int] NULL, + [ProNum] [int] NULL, + CONSTRAINT [PK_Manager_Attempted] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY]; + +--HSEĿʵ 3 +alter table Manager_MonthReportC +add Goalach1 [decimal](18, 2) NULL; + +alter table Manager_MonthReportC +add Goalach2 [decimal](18, 2) NULL; + +alter table Manager_MonthReportC +add Goalach3 [decimal](18, 2) NULL; + +--± 1 +alter table Manager_MonthReportC +add MonthReportType nvarchar(20) NULL; \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-27-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-27-phf.sql new file mode 100644 index 00000000..87ef208b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-27-phf.sql @@ -0,0 +1,6 @@ +CREATE NONCLUSTERED INDEX EduTrain_TrainRecordDetail_TrainingId_Index +ON [dbo].[EduTrain_TrainRecordDetail] ([TrainingId]); + +CREATE NONCLUSTERED INDEX Sys_CodeRecords_DataId_Index +ON [dbo].[Sys_CodeRecords] ([DataId]) +INCLUDE ([Code]); \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-29-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-29-phf.sql new file mode 100644 index 00000000..cd4ae5eb --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-29-phf.sql @@ -0,0 +1,4 @@ +--ûõIJ˵ +update sys_menu set IsUsed='0' where menuid='CD167198-1667-4552-9876-E768C2542C30'; +update sys_menu set IsUsed='0' where menuid='DA7D64F8-A107-4DBC-B7E4-5C79409EB9FA'; +update sys_menu set IsUsed='0' where menuid='B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE'; diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-30-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-30-phf.sql new file mode 100644 index 00000000..9da61937 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-30-phf.sql @@ -0,0 +1,6 @@ +alter table Transfer_RotatingEquipment +add Lubricatefilling nvarchar(50) null; + + +alter table Transfer_Instrumentation +add Calibration nvarchar(50) null; \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-09-02-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-09-02-phf.sql new file mode 100644 index 00000000..3b56eef6 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-09-02-phf.sql @@ -0,0 +1,6 @@ +ALTER TABLE Manager_Month_InjuryAccidentC +add LossCount int null; + +ALTER TABLE Manager_Month_InjuryAccidentC +add DeathCount int null; + diff --git a/ReleasePackerALL2017_lpf.bat b/ReleasePackerALL2017_lpf.bat new file mode 100644 index 00000000..8714a249 --- /dev/null +++ b/ReleasePackerALL2017_lpf.bat @@ -0,0 +1,142 @@ +@echo off +REM --------------- +REM ɹ +REM ִдļǰReleasepublisherĿ +REM -------------- + + + +REM -------------- +REM Project_SrcΪPUBLISHER4_CODINGķ֧ +REM -------------- +set PROJECT_SRC=%CD% + +REM ԴpublisherĿļ +set PUBLISHER_SRC_ROOT=%PROJECT_SRC%\SGGL\FineUIPro.Web + +REM Դ汾־ļ +set VerLog_SRC_ROOT=%PROJECT_SRC%\database\汾־ + +REM ļ +SET ReleasePack=PackFile + +REM ļ +SET ReleasePackFolder=%PROJECT_SRC%\SGGL%ReleasePack% + +REM publisherļļ +SET RELEASE_PUBLISHER_ROOT=%PROJECT_SRC%\SGGL%ReleasePack%\%ReleasePack% + +REM 汾־ļļ +SET RELEASE_VerLog_ROOT=%PROJECT_SRC%\SGGL%ReleasePack%\汾־ + + +REM -------------- +REM ļ +REM -------------- + +IF exist %ReleasePackFolder%\nul.ext ( +@echo ɾѴڵķļ +@echo. +rd %ReleasePackFolder% /S /Q +) +mkdir %ReleasePackFolder% + + +IF exist %RELEASE_VerLog_ROOT%\nul.ext ( +rd %RELEASE_VerLog_ROOT% /S /Q +) +mkdir %RELEASE_VerLog_ROOT% + + +IF errorlevel 1 goto delReleasePackError + + +@echo .net̨ +@echo. +@call "D:\Visual Studio 2022\Common7\Tools\VsDevCmd.bat" +IF errorlevel 1 goto netEnvironmentError + + +@echo ʼԤ... +@echo. +aspnet_compiler -p %PUBLISHER_SRC_ROOT% %RELEASE_PUBLISHER_ROOT% -u -v / +IF errorlevel 1 goto aspnet_compilerError +@echo Ԥ +@echo. + + +@echo ʼϲ... +@echo. +Aspnet_merge %RELEASE_PUBLISHER_ROOT% -o UI +IF errorlevel 1 goto Aspnet_mergeError +@echo ϲ +@echo. + + +REM -------------- +REM ɾҪļ +REM -------------- + +@echo ʼļ... +@echo. + +del %RELEASE_PUBLISHER_ROOT%\*.cs /s /f +del %RELEASE_PUBLISHER_ROOT%\*.designer.cs /s /f +del %RELEASE_PUBLISHER_ROOT%\*.csproj /s /f +del %RELEASE_PUBLISHER_ROOT%\*.csproj.* /s /f +del %RELEASE_PUBLISHER_ROOT%\*.pdb /s /f +del %RELEASE_PUBLISHER_ROOT%\*.resx /s /f + +del %RELEASE_PUBLISHER_ROOT%\*.db /s /f +del %RELEASE_PUBLISHER_ROOT%\*.bak /s /f +del %RELEASE_PUBLISHER_ROOT%\*.*.bak /s /f +del %RELEASE_PUBLISHER_ROOT%\*.sln /s /f +del %RELEASE_PUBLISHER_ROOT%\*.suo /s /f +del %RELEASE_PUBLISHER_ROOT%\*.scc /s /f +rd %RELEASE_PUBLISHER_ROOT%\obj /s /q + +del %RELEASE_PUBLISHER_ROOT%\ReadMe.txt /s /f +del %RELEASE_PUBLISHER_ROOT%\*.pfx /s /f +del %RELEASE_PUBLISHER_ROOT%\*.StyleCop /s /f + +@echo +@echo. + +REM -------------- +REM 汾־ +REM -------------- +@echo 汾־... +@echo. + +copy %VerLog_SRC_ROOT%\*.* %RELEASE_VerLog_ROOT% /Y + + + + +@echo ,·Ϊ%ReleasePackFolder% +@echo. +goto END + + +:delReleasePackError +@echo. +@echo ɾ洢ļʧ! +goto END + +:netEnvironmentError +@echo. +@echo .netʧ! +goto END + +:aspnet_compilerError +@echo. +@echo Ԥʧ! +goto END + +:Aspnet_mergeError +@echo. +@echo ϲʧ! +goto END + +:END +pause diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index c89257b8..e8b5e74f 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -763,6 +763,10 @@ namespace BLL { newPerson.TeamGroupId = person.TeamGroupId; } + if (!string.IsNullOrEmpty(person.WorkPostName)) + { + person.WorkPostId = WorkPostService.AddWorkPostByName(person.WorkPostName); + } if (!string.IsNullOrEmpty(person.WorkPostId)) { newPerson.WorkPostId = person.WorkPostId; diff --git a/SGGL/BLL/AnBang/AnBangService.cs b/SGGL/BLL/AnBang/AnBangService.cs new file mode 100644 index 00000000..06f552c4 --- /dev/null +++ b/SGGL/BLL/AnBang/AnBangService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public static class AnBangService + { + } +} diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index c320958d..100e10d6 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -85,6 +85,7 @@ + diff --git a/SGGL/BLL/BaseInfo/WorkPostService.cs b/SGGL/BLL/BaseInfo/WorkPostService.cs index 3992f1ca..74cb6cd6 100644 --- a/SGGL/BLL/BaseInfo/WorkPostService.cs +++ b/SGGL/BLL/BaseInfo/WorkPostService.cs @@ -45,7 +45,36 @@ namespace BLL db.Base_WorkPost.InsertOnSubmit(newWorkPost); db.SubmitChanges(); } + public static string AddWorkPostByName(string workPostName) + { + string workpostid = String.Empty; + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var model = db.Base_WorkPost.FirstOrDefault(e => e.WorkPostName == workPostName); + if (model != null) + { + workpostid = model.WorkPostId; + } + else + { + Model.Base_WorkPost newWorkPost = new Model.Base_WorkPost + { + WorkPostId = SQLHelper.GetNewID(), + WorkPostCode = "", + WorkPostName = workPostName, + IsHsse = false, + IsCQMS = false, + CNCodes = "", + }; + db.Base_WorkPost.InsertOnSubmit(newWorkPost); + db.SubmitChanges(); + workpostid = newWorkPost.WorkPostId; + } + + return workpostid; + } + } /// /// 修改 /// diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index e1e1433b..d2b95329 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3359,6 +3359,11 @@ namespace BLL /// public const string ConExperienceSummaryTemUrl = "File\\Excel\\DataIn\\类似项目施工经验总结清单导入模板.xls"; + /// + /// 新项目安全月报模板文件原始虚拟路径 + /// + public const string HseMonthReportNewTemplateUrl = "File\\Word\\HSSE\\项目安全月报.doc"; + #region 导出模板 /// /// 质量专项检查模板文件原始虚拟路径 @@ -6061,5 +6066,10 @@ namespace BLL /// 检查表尾项管理 /// public const string InspectTailTerm = "B6A6EA7D-EDAB-40C8-920D-A106731D0E08"; + + /// + /// HSSE管理月报新 + /// + public const string ManagerMonthCNewMenuId = "9E4B28DF-8C8E-49F8-AB15-270BBDC73449"; } } \ No newline at end of file diff --git a/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs b/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs index 43a185b4..793f03ea 100644 --- a/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs +++ b/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs @@ -102,5 +102,33 @@ namespace BLL var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(a => a.Id == newId); return result; } + + /// + /// 根据时间、项目获取五环安全费用投入登记信息 + /// + /// + /// + /// + /// + public static List GetPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId, string unitId) + { + return (from x in Funs.DB.CostGoods_HseExpense where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId && x.UnitId == unitId select x).ToList(); + } + + /// + /// 根据时间、项目获取施工分包商安全费用投入登记信息 + /// + /// + /// + /// + /// + public static List GetConPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId) + { + return (from x in Funs.DB.CostGoods_HseExpense + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId + && y.UnitTypeId == BLL.Const.UnitId_Con + select x).ToList(); + } } } diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs index 157168e1..3d02faf6 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs @@ -159,5 +159,15 @@ namespace BLL { return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate >= startTime && x.TrainStartDate <= endTime && x.ProjectId == projectId select x.TrainPersonNum).Sum(); } + + public static List GetTrainingsByTrainDate(DateTime endTime, string projectId) + { + return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate <= endTime && x.ProjectId == projectId select x).ToList(); + } + + public static int? GetTrainPersonCount(DateTime endTime, string projectId) + { + return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate <= endTime && x.ProjectId == projectId select x.TrainPersonNum).Sum(); + } } } diff --git a/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs b/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs index 24423490..a04131aa 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs @@ -86,6 +86,14 @@ namespace BLL BLL.CommonService.DeleteAttachFileById(EmergencyTeamAndTrain.FileId); ////删除流程表 BLL.CommonService.DeleteFlowOperateByID(EmergencyTeamAndTrain.FileId); + + //删除子表 + var list = db.Emergency_EmergencyTeamItem.Where(x => x.FileId == FileId).ToList(); + if (list.Count>0) + { + db.Emergency_EmergencyTeamItem.DeleteAllOnSubmit(list); + } + db.Emergency_EmergencyTeamAndTrain.DeleteOnSubmit(EmergencyTeamAndTrain); db.SubmitChanges(); } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs index da35174c..099195d2 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs @@ -90,8 +90,12 @@ namespace BLL public static void DeleteAccidentSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_AccidentSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_AccidentSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_AccidentSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs index b48153ae..ed8d165c 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs @@ -54,8 +54,12 @@ namespace BLL public static void DeleteCheckDetailSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_CheckDetailSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_CheckDetailSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_CheckDetailSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs index d180978b..4d5c454b 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs @@ -49,8 +49,10 @@ namespace BLL public static void DeleteDrillSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_DrillSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_DrillSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count > 0) { + db.Manager_DrillSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs index a3bd7430..f62c24be 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs @@ -49,8 +49,9 @@ namespace BLL public static void DeleteEmergencySortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_EmergencySortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_EmergencySortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count > 0) { + db.Manager_EmergencySortC.DeleteAllOnSubmit(q); + db.SubmitChanges();} } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs index a757fa96..c10a2a87 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs @@ -49,8 +49,13 @@ namespace BLL public static void DeleteHazardSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_HazardSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_HazardSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_HazardSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + + } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs index 2a285790..9f56e718 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs @@ -78,8 +78,11 @@ namespace BLL public static void DeleteHseCostsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_HseCostC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_HseCostC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_HseCostC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs index 299f1d8c..bd94ed87 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs @@ -68,8 +68,11 @@ namespace BLL public static void DeleteIncentiveSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_IncentiveSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_IncentiveSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count > 0) + { + db.Manager_IncentiveSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs index 07f849d9..ca747649 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs @@ -36,9 +36,11 @@ namespace BLL FirstAidDressing = injuryAccident.FirstAidDressing, MedicalTreatment = injuryAccident.MedicalTreatment, WorkLimitation = injuryAccident.WorkLimitation, + LossCount = injuryAccident.LossCount, LossPerson = injuryAccident.LossPerson, LossWorkTime = injuryAccident.LossWorkTime, LossEconomy = injuryAccident.LossEconomy, + DeathCount=injuryAccident.DeathCount, DeathPerson = injuryAccident.DeathPerson, DeathWorkTime = injuryAccident.DeathWorkTime, DeathEconomy = injuryAccident.DeathEconomy diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs index 08028382..a5830ff9 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs @@ -56,8 +56,12 @@ namespace BLL public static void DeleteMeetingSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_MeetingSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_MeetingSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_MeetingSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs index be75da67..faca8a61 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs @@ -227,6 +227,21 @@ namespace BLL Question = monthReport.Question, SubcontractManHours = monthReport.SubcontractManHours, AccidentDef = monthReport.AccidentDef, + + StartDate=monthReport.StartDate, + EndDate=monthReport.EndDate, + TotalHseManhoursYear = monthReport.TotalHseManhoursYear, + + EmergencyManagementWorkDef=monthReport.EmergencyManagementWorkDef, + MonthHdangerCount=monthReport.MonthHdangerCount, + YearHdangerCount=monthReport.YearHdangerCount, + + MonthExpertCount=monthReport.MonthExpertCount, + MonthExpertNoCount=monthReport.MonthExpertNoCount, + Goalach1=monthReport.Goalach1, + Goalach2=monthReport.Goalach2, + Goalach3=monthReport.Goalach3, + MonthReportType=monthReport.MonthReportType }; db.Manager_MonthReportC.InsertOnSubmit(newMonthReport); @@ -245,7 +260,7 @@ namespace BLL Model.Manager_MonthReportC newMonthReport = db.Manager_MonthReportC.First(e => e.MonthReportId == monthReport.MonthReportId); newMonthReport.MonthReportCode = monthReport.MonthReportCode; newMonthReport.ProjectId = monthReport.ProjectId; - newMonthReport.Months = monthReport.Months; + //newMonthReport.Months = monthReport.Months; newMonthReport.MonthReportDate = monthReport.MonthReportDate; newMonthReport.ReportMan = monthReport.ReportMan; newMonthReport.HseManhours = monthReport.HseManhours; @@ -298,6 +313,19 @@ namespace BLL newMonthReport.SubcontractManHours = monthReport.SubcontractManHours; newMonthReport.AccidentDef = monthReport.AccidentDef; + newMonthReport.StartDate = monthReport.StartDate; + newMonthReport.EndDate = monthReport.EndDate; + newMonthReport.TotalHseManhoursYear = monthReport.TotalHseManhoursYear; + + newMonthReport.EmergencyManagementWorkDef = monthReport.EmergencyManagementWorkDef; + newMonthReport.MonthHdangerCount = monthReport.MonthHdangerCount; + newMonthReport.YearHdangerCount = monthReport.YearHdangerCount; + newMonthReport.MonthExpertCount = monthReport.MonthExpertCount; + newMonthReport.MonthExpertNoCount = monthReport.MonthExpertNoCount; + newMonthReport.Goalach1 = monthReport.Goalach1; + newMonthReport.Goalach2 = monthReport.Goalach2; + newMonthReport.Goalach3 = monthReport.Goalach3; + newMonthReport.MonthReportType = monthReport.MonthReportType; db.SubmitChanges(); } @@ -315,5 +343,31 @@ namespace BLL db.Manager_MonthReportC.DeleteOnSubmit(monthReport); db.SubmitChanges(); } + + #region 保存4.6.1应急预案发布情况 + public static void AddManager_EmergencyPlan(Model.Manager_EmergencyPlan model) { + Model.SGGLDB db = Funs.DB; + db.Manager_EmergencyPlan.InsertOnSubmit(model); + db.SubmitChanges(); + } + #endregion + + #region 保存4.6.2 应急演练工作情况说明 + public static void AddManager_DrillRecordList(Model.Manager_DrillRecordList model) + { + Model.SGGLDB db = Funs.DB; + db.Manager_DrillRecordList.InsertOnSubmit(model); + db.SubmitChanges(); + } + #endregion + + #region 保存6.1 未遂事件统计 + public static void AddManager_Attempted(Model.Manager_Attempted model) + { + Model.SGGLDB db = Funs.DB; + db.Manager_Attempted.InsertOnSubmit(model); + db.SubmitChanges(); + } + #endregion } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs index 63567655..7dc57534 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs @@ -48,8 +48,11 @@ namespace BLL public static void DeleteOtherActiveSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_OtherActiveSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_OtherActiveSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count > 0) + { + db.Manager_OtherActiveSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs index d57b308e..c9a101a8 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs @@ -58,5 +58,77 @@ namespace BLL db.Manager_PersonSortC.DeleteAllOnSubmit(q); db.SubmitChanges(); } + + /// + /// 根据月报告主键删除对应的所有月报告HSE人力投入信息 + /// + /// 月报告主键 + public static void DeleteManager_HiddenDanger(string monthReportId) + { + var q = (from x in db.Manager_HiddenDanger where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count>0) + { + db.Manager_HiddenDanger.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 删除月报项目作业许可管理数据 + /// + /// + public static void DeleteManager_ProjectAssignment(string monthReportId) + { + var q = (from x in db.Manager_ProjectAssignment where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count > 0) + { + db.Manager_ProjectAssignment.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 删除月报应急预案发布情况 + /// + /// + public static void DeleteManager_EmergencyPlan(string monthReportId) + { + var q = (from x in db.Manager_EmergencyPlan where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count > 0) + { + db.Manager_EmergencyPlan.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 删除月报应急演练工作情况说明 + /// + /// + public static void DeleteManager_DrillRecordList(string monthReportId) + { + var q = (from x in db.Manager_DrillRecordList where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count > 0) + { + db.Manager_DrillRecordList.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + /// + /// 删除月报未遂事件 + /// + /// + public static void DeleteManager_Attempted(string monthReportId) + { + var q = (from x in db.Manager_Attempted where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count > 0) + { + db.Manager_Attempted.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + + } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs index 70252a2e..a16b7af1 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs @@ -49,8 +49,12 @@ namespace BLL public static void DeletePromotionalActiviteSortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_PromotionalActiviteSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_PromotionalActiviteSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_PromotionalActiviteSortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs index e9767cbf..3215e055 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs @@ -48,8 +48,12 @@ namespace BLL public static void DeleteTrainActivitySortsByMonthReportId(string monthReportId) { var q = (from x in db.Manager_TrainActivitySortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_TrainActivitySortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + if (q.Count>0) + { + db.Manager_TrainActivitySortC.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs index 817befa0..c027c866 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs @@ -51,9 +51,20 @@ namespace BLL /// 月报告主键 public static void DeleteTrainSortsByMonthReportId(string monthReportId) { - var q = (from x in db.Manager_TrainSortC where x.MonthReportId == monthReportId select x).ToList(); - db.Manager_TrainSortC.DeleteAllOnSubmit(q); - db.SubmitChanges(); + try + { + var q = (from x in Funs.DB.Manager_TrainSortC where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count > 0) + { + Funs.DB.Manager_TrainSortC.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}"); + } + } } } diff --git a/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs b/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs index 5bcfae71..bf1061ba 100644 --- a/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs +++ b/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs @@ -276,7 +276,7 @@ namespace BLL } else { - List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();//装置条件为空时获取对应操作表中所有的装置 + List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList();//装置条件为空时获取对应操作表中所有的装置 foreach (Model.WBS_UnitWork item in InstallationList) { Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault(); @@ -289,7 +289,7 @@ namespace BLL } else { - List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId select x).ToList(); + List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList(); foreach (Model.WBS_UnitWork item in InstallationList) { Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault(); diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index cde8789c..cf918b4a 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -402,7 +402,7 @@ namespace BLL string[] type = null; if (!string.IsNullOrEmpty(projectType)) type = projectType.Split(','); - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x; return unitWorks.ToList(); } /// @@ -454,12 +454,12 @@ namespace BLL { if (ProjectType == "1") { - List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList(); + List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList(); return lis; } else if (ProjectType == "2") { - List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList(); + List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList(); return lis; } else diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs index ead03467..535bb675 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs @@ -702,7 +702,7 @@ namespace BLL public static int GetUnitProjectNum(string projectid) { int result = (from x in Funs.DB.WBS_UnitWork - where x.ProjectId == projectid + where x.ProjectId == projectid && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).Count(); return result; } diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index f2584260..af03a574 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -109,7 +109,7 @@ namespace FineUIPro.Web.CQMS.Check string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName," + @" QualityQuestionType.QualityQuestionType as QuestionType,chec.LimitDate," + @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode," - + @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.userName " + + @" unit.UnitName,unitWork.UnitWorkName,u.userName " + @" FROM Check_CheckControl chec" + @" left join Base_Unit unit on unit.unitId=chec.unitId" + @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode" diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs index 6f925940..4031192e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs @@ -388,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; var cns = from x in Funs.DB.Base_CNProfessional select x; - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x; + var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x; var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder where x.ProjectId == this.CurrUser.LoginProjectId select x; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx index ce362a07..91601a21 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx @@ -17,6 +17,9 @@ color: Red; font-size: small; } + .f-grid-row.Gray { + background-color: gray; + } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index 41427d4a..1e0e8e4f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.Comprehensive { string strSql = @"select InspectionMachineId, InspectionMachineCode, U.UnitName,CN.ProfessionalName ,Status, InspectionMachineName, SpecificationModel, NextTestDate, TestCycle, C.InspectionDate, - InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode + InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode,C.IsOnSite from Comprehensive_InspectionMachine C left join Base_Unit U on C.UnitId=U.UnitId left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId @@ -106,7 +106,7 @@ namespace FineUIPro.Web.Comprehensive DataRowView row = e.DataItem as DataRowView; string IsVerification = row["IsVerification"].ToString(); string NextTestDate = row["NextTestDate"].ToString(); - string InspectionType= row["InspectionType"].ToString(); + string InspectionType = row["InspectionType"].ToString(); if (InspectionType == "计量") { if (IsVerification == "是" && !string.IsNullOrEmpty(NextTestDate)) //在校验期内 @@ -126,6 +126,13 @@ namespace FineUIPro.Web.Comprehensive } } + //离场为灰色 + string LeaveDate = row["LeaveDate"].ToString(); + string IsOnSite = row["IsOnSite"].ToString(); + if (!string.IsNullOrEmpty(LeaveDate) || IsOnSite == "False") + { + e.RowCssClass = "Gray"; + } } #region 查询 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx index b19be888..84e38f00 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx @@ -17,6 +17,9 @@ color: Red; font-size: small; } + .f-grid-row.Gray { + background-color: gray; + } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs index 0b9cb198..06888830 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs @@ -301,25 +301,27 @@ namespace FineUIPro.Web.Comprehensive { DataRowView row = e.DataItem as DataRowView; - string ValidityDate = row["ValidityDate"].ToString(); if (!string.IsNullOrEmpty(ValidityDate)) { if (DateTime.Compare(DateTime.Parse(ValidityDate).AddDays(-15), DateTime.Now) < 0) { - // Grid1.Rows[e.RowIndex].RowCssClass = "Red"; - //过期为红色 + // Grid1.Rows[e.RowIndex].RowCssClass = "Red"; + //过期为红色 e.RowCssClass = "Red"; - } } else { e.RowCssClass = "Yellow"; - - } - + //离场人员为灰色 + string DepartureTime = row["DepartureTime"].ToString(); + string IsOnSite = row["IsOnSite"].ToString(); + if (!string.IsNullOrEmpty(DepartureTime) || IsOnSite == "False") + { + e.RowCssClass = "Gray"; + } } /// /// Grid行点击事件 diff --git a/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs index 7f6b8c70..f12d1b38 100644 --- a/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs @@ -2287,7 +2287,7 @@ namespace FineUIPro.Web.CQMS.DataBase private void WBSDataBind(string cNProfessionalCode) { this.tvWBS.Nodes.Clear(); - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var q in installations) { TreeNode newNode = new TreeNode(); @@ -2362,7 +2362,7 @@ namespace FineUIPro.Web.CQMS.DataBase private void WBSDataBind2(string cNProfessionalCode) { this.tvWBS2.Nodes.Clear(); - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var q in installations) { TreeNode newNode = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs index bfad9bb8..d2ddc5da 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign this.tvControlItem.AutoScroll = true; this.tvControlItem.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var item in unitWorks) { TreeNode rootNode1 = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs index 0efb5e87..564f174f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign this.tvControlItem.AutoScroll = true; this.tvControlItem.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var item in unitWorks) { TreeNode rootNode1 = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx index cfb5ac56..a4d61fba 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx @@ -22,7 +22,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 9cf19e18..800ff4e3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { GetButtonPower(); BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业 - UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BindGrid(); } } @@ -59,10 +59,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl + @" WHERE P.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (drpUnitWork.SelectedValue != BLL.Const._Null) + if (drpUnit.SelectedValue != BLL.Const._Null) { - strSql += " AND D.UnitWorkId=@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", drpUnitWork.SelectedValue)); + strSql += " AND P.UnitId=@UnitId"; + listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue)); } if (drpCNProfessional.SelectedValue != BLL.Const._Null) { @@ -251,9 +251,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl on x.InspectionId equals y.InspectionId where y.ProjectId == this.CurrUser.LoginProjectId select y); - if (drpUnitWork.SelectedValue != BLL.Const._Null) + if (drpUnit.SelectedValue != BLL.Const._Null) { - lists = lists.Where(x => x.UnitWorkId == drpUnitWork.SelectedValue); + lists = lists.Where(x => x.UnitId == drpUnit.SelectedValue); } if (drpCNProfessional.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs index 914a43ba..5e2e1a96 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.ProcessControl -{ - - - public partial class InspectionManagement - { - +namespace FineUIPro.Web.CQMS.ProcessControl { + + + public partial class InspectionManagement { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -58,16 +56,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// - /// drpUnitWork 控件。 + /// drpUnit 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWork; - + protected global::FineUIPro.DropDownList drpUnit; + /// /// drpCNProfessional 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessional; - + /// /// txtStarTime 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + /// /// btnSearch 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnOut 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblPageIndex 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label3 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// lbtnFileUrl 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -175,7 +173,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -184,7 +182,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -193,7 +191,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx index ae285275..8b729aa2 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx @@ -22,7 +22,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index 6ed00eea..e1faeafe 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -26,7 +26,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl { GetButtonPower(); BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业 - UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BindGrid(); } } @@ -59,10 +59,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl + @" WHERE P.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (drpUnitWork.SelectedValue != BLL.Const._Null) + if (drpUnit.SelectedValue != BLL.Const._Null) { - strSql += " AND D.UnitWorkId=@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", drpUnitWork.SelectedValue)); + strSql += " AND P.UnitId=@UnitId"; + listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue)); } if (drpCNProfessional.SelectedValue != BLL.Const._Null) { @@ -279,9 +279,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl on x.InspectionId equals y.InspectionId where y.ProjectId == this.CurrUser.LoginProjectId select y); - if (drpUnitWork.SelectedValue != BLL.Const._Null) + if (drpUnit.SelectedValue != BLL.Const._Null) { - lists = lists.Where(x => x.UnitWorkId == drpUnitWork.SelectedValue); + lists = lists.Where(x => x.UnitId == drpUnit.SelectedValue); } if (drpCNProfessional.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs index 6aa89952..7d6c8702 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs @@ -58,13 +58,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl { protected global::FineUIPro.Toolbar ToolSearch; /// - /// drpUnitWork 控件。 + /// drpUnit 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWork; + protected global::FineUIPro.DropDownList drpUnit; /// /// drpCNProfessional 控件。 diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs index 40d9df79..735f3404 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.trWBS.EnableIcons = true; this.trWBS.AutoScroll = true; this.trWBS.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var q in unitWorks) { TreeNode newNode = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs index bb089b55..17dcd7eb 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs @@ -25,6 +25,18 @@ namespace FineUIPro.Web.CQMS.WBS ViewState["BreakdownProjectId"] = value; } } + + public string UnitWorkId + { + get + { + return (string)ViewState["UnitWorkId"]; + } + set + { + ViewState["UnitWorkId"] = value; + } + } #endregion protected void Page_Load(object sender, EventArgs e) @@ -38,6 +50,7 @@ namespace FineUIPro.Web.CQMS.WBS var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId); if (division != null) { + this.UnitWorkId = division.UnitWorkId; if (division.CNProfessionalId != null && Const.CNProfessionalConstructId == division.CNProfessionalId) { this.tr1.Hidden = false; @@ -125,6 +138,7 @@ namespace FineUIPro.Web.CQMS.WBS } } newBreakdown.Remark = this.txtRemark.Text.Trim(); + newBreakdown.UnitWorkId = this.UnitWorkId; if (Request.Params["type"] == "add") { if (this.rblIsAcceptance.SelectedValue == "True") diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..d5ff0428 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,282 @@ + +错误信息开始=====> +错误类型:SqlException +错误信息:无法绑定由多个部分组成的标识符 "D.UnitWorkId"。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 83 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 135 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/02/2024 10:32:29 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionNotice.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/02/2024 10:32:29 + + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'NextNum' 无效。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.ExecuteReader() + 在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult) + 在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries) + 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) + 在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable.GetEnumerator() + 在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection) + 在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source) + 在 FineUIPro.Web.common.mainProject2.GetJD() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:行号 720 + 在 FineUIPro.Web.common.mainProject2.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:行号 113 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/25/2024 17:08:52 +出错文件:http://localhost:8579/common/mainProject2.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/25/2024 17:08:52 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT NEWID() AS ID, CardNo,PersonNa' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.HSSE.EduTrain.TrainFind.BindGrid() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:行号 116 + 在 FineUIPro.Web.HSSE.EduTrain.TrainFind.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:行号 59 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2024 15:38:17 +出错文件:http://localhost:8579/HSSE/EduTrain/TrainFind.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/03/2024 15:38:17 + + +错误信息开始=====> +错误类型:FormatException +错误信息:输入字符串的格式不正确。 +错误堆栈: + 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal) + 在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info) + 在 System.String.System.IConvertible.ToInt32(IFormatProvider provider) + 在 System.Convert.ToInt32(Object value) + 在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow ) + 在 (GridColumn , GridRow ) + 在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34 + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.btnSearch_Click(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 39 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2024 15:53:12 +出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/03/2024 15:53:12 + + +错误信息开始=====> +错误类型:FormatException +错误信息:输入字符串的格式不正确。 +错误堆栈: + 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal) + 在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info) + 在 System.String.System.IConvertible.ToInt32(IFormatProvider provider) + 在 System.Convert.ToInt32(Object value) + 在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow ) + 在 (GridColumn , GridRow ) + 在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34 + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2024 15:53:47 +出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/03/2024 15:53:47 + + +错误信息开始=====> +错误类型:FormatException +错误信息:输入字符串的格式不正确。 +错误堆栈: + 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal) + 在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info) + 在 System.String.System.IConvertible.ToInt32(IFormatProvider provider) + 在 System.Convert.ToInt32(Object value) + 在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow ) + 在 (GridColumn , GridRow ) + 在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34 + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2024 15:54:12 +出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/03/2024 15:54:12 + + +错误信息开始=====> +错误类型:FormatException +错误信息:输入字符串的格式不正确。 +错误堆栈: + 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal) + 在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info) + 在 System.String.System.IConvertible.ToInt32(IFormatProvider provider) + 在 System.Convert.ToInt32(Object value) + 在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow ) + 在 (GridColumn , GridRow ) + 在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34 + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2024 15:54:41 +出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/03/2024 15:54:41 + + +错误信息开始=====> +错误类型:FormatException +错误信息:输入字符串的格式不正确。 +错误堆栈: + 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal) + 在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info) + 在 System.String.System.IConvertible.ToInt32(IFormatProvider provider) + 在 System.Convert.ToInt32(Object value) + 在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow ) + 在 (GridColumn , GridRow ) + 在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN() + 在 (GridRow ) + 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean ) + 在 (Grid , IEnumerable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34 + 在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/03/2024 15:55:36 +出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/03/2024 15:55:36 + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls index bcfae096..88c5d12d 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls index 20a6b06f..ffd0af3e 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls index d257e13d..5d30839f 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls index f980f7e8..61ae6a86 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/项目安全月报.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/项目安全月报.doc new file mode 100644 index 00000000..cd4ab05c --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Word/HSSE/项目安全月报.doc @@ -0,0 +1,677 @@ +ࡱ>  +  !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~Root Entry FǸSummaryInformation( DocumentSummaryInformation8 WordDocument +  +Oh+'0  +  ,8@HPWPS_1615305698 Normal.dotmWPS_16153056981@JO@Xk@X#=WPS Office_12.1.0.17827_F1E327BC-269C-435d-A152-05C5408002CA +՜.+,D՜.+,HPXdlt | 0t|KSOProductBuildVerICV2052-12.1.0.17827$9A55B1C6F49E4E618575C2D3074788B3_11,0Table&Data +DLWpsCustomData0 PKSKSbb$P, +,] !$x&$qhbH"A@M}%BZ -NVNs ] z gPlQSyvS,{1uqQu yvHSEgbJT bJTgz^S HSE~te g 1 yviQ yv Ty (u7b Ty yv0W@W yvS T TS yv{|W ]\OV yv^T T]g yve]_]e ] z-NNce 2 ,ggyvs:WHSENRbeQ`Q USMO;`NpeNL HSE Npe{tNXTpeϑbSVYl,gYX 3 ,ggyvs:WHSE]e/]e~ ޏ~[hQ]\O)YpeHSEN]eHSEN]e,ggޏ~[hQ]\O)Ype/}ޏ~[hQ]\O)Ype,ggHSEN]et^^/}HSEN]e;`/}HSEN]e,ggHSEN]et^^/}HSEN]eyv/}HSE N]eNsRSFU YlNeyvSu͑$ONEe ޏ~[hQ]\O)Ype\n͑e~0 4 HSE~He{tpenc 4.1 Wpenc~ ^SW{|Wf[epeWNpeWNpe/}WNpeT1XT]eQ:W[hQYe2vQN[hQW3Ny[hQW 4.2 s:WHSEOShg~ hg{|W,gg_U\!kpet^^/}!kpeyv;`/}!kpe 4.3 ,gg`te9e`Q ^SUSMO TyN,`pe͑'Y`pe` cete9es 4.4 yv\ONS{tpenc \ONQ[\ONSpeϑ\ONQ[\ONSpeϑRkp\ONRW\ONSPzz\ON4Ne(u5u\ONؚY\ON\~\ON +Tň\ONYe],gg\ONSTt^^\ONS;`yv\ONS/} 4.5 yv,ggqS'Y] z{tpenc qS'Y] z{|+RqS'Y] zpeϑ*N ^~N[vqS'Y] z~N[vqS'Y] z 4.6 ^%`{t 4.6.1 ^%`HhS^`Q ^SHh{|+R,ggS^/fet^^S^/fe/}S^/fe 4.6.2 ^%`o~]\O`Qf ^So~ Tyo~ego~b__SoNpebeQ9(u/CQ 4.6.3vQN^%`{t]\Oc,ggY g 4.7 HSEVYRNYZ ,ggHSE VYR!kpe,ggVYR ёCQ yv/} VYRё,ggHSE YZ!kpe,ggYZ ёCQ yv/} YZё 4.8 HSEs:WvQN{t`Q ^S{tQ[c 5 ,ggyvHSE9(u{t 5.1 ,ggyvHSE9(ubeQ~USMONCQ ^SbeQyvNs] ze]RSFU,ggyvT,ggyv/} 6 HSE#NNEe/NNc 6.1 HSE#NNEe/NN{t~Hepenc~ 1 *gBNN~ *gBNNwpeNsRSFU,gg,ggt^^/}t^^/}yv/} ,gg$O[NEe~ NEe {|+R #N USMO%`QeSNbNEeNpeSU_NN;SuYnNEeNpe]\OSPNEeNpelQ:y_c1YNEe_c]NEe{kNNEewpeNpe_c1Y]e~Nm_c1YwpeNpe_c1Y]e~Nm_c1Y 6.2 NEe/NNceW[c 6.3 HSEvh[s`Q ^SvhQ[vhKmϑvh@BDFHJLNRVZ^bfjƼ~sh]RG<B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*ph^Jo( *B*ph^J *B*phPJ^J *B*ph^Jo( *B*phPJ^J *B*ph^Jo( *B*phPJ^J *B*ph^J *B*phPJ^J *B*ph^Jo( *B*phCJ^JaJ5 *\jnrtx|Ŵsh]SH>3B*phPJ^J *B*ph^Jo( *B*phPJ^J *B*ph^Jo( *B*phPJ^J *B*phPJ^J *B*phPJ^J5 *\"B*phCJHPJ^JaJH5 *\!B*phCJH^Jo(aJH5 *\B*phCJH^JaJH5 *\!B*phCJH^Jo(aJH5 *\"B*phCJ PJ^JaJ 5 *\"B*phCJ PJ^JaJ 5 *\B*phPJ^J *B*phPJ^J *źxmbWLA8B*ph^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*phPJ^J *"B*phCJ$PJ^JaJ$5 *\"B*phCJ$PJ^JaJ$5 *\    +   ( ·~fJ6'B*phCJOJPJQJ^Jo(aJ *6B*phCJOJPJQJ^Jo(aJhKH *nHtH.B*phCJOJPJQJ^Jo(aJhKH *6B*phCJOJPJQJ^Jo(aJhKH *nHtH B*ph *B*phPJ^J *B*phPJ^J *B*phPJ^J *B*ph^Jo( *B*ph^J *B*ph^Jo( *B*phPJ^J *B*phPJ^J *B*ph^Jo( *( * 4 6 B D L N V X b ïs_C/'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * +b d n p ïs_K7'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * + ڵkG!KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\GB*phCJOJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\GB*phCJOJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\HB*phCJOJPJQJ^Jo(aJ5hKH *mH sH nHtH_H\HB*phCJOJPJQJ^Jo(aJ5hKH *mH sH nHtH_H\  + + + + + +ٳiEKB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\GB*phCJOJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\GB*phCJOJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\ + + +" +& +( +* +ٵkEKB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\GB*phCJOJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\GB*phCJOJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\* +, +0 +2 +4 +< +H +X +ٳiQ=%/B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtHHB*phCJOJPJQJ^Jo(aJ5hKH *mH sH nHtH_H\HB*phCJOJPJQJ^Jo(aJ5hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\KB*phCJOJPJQJ^Jo(aJ5H*hKH *mH sH nHtH_H\X +\ +^ +n +p +| +~ + + + + + +ïs_K7#'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * + + + + + + + +    ïs_K<('B*phCJOJPJQJ^Jo(aJ *B*pho(mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *  " , . 4 8 : < > @ B ѽmYE1'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH +B F H N P R V X Z \ ^ ` ïs_K7#'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * ` b d f j l ïo[C/'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * + ӻgP<('B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *-B*phCJOJPJQJ^Jo(aJ5 *\HB*phCJOJPJQJ^Jo(aJ5hKH *mH sH nHtH_H\-B*phCJOJPJQJ^Jo(aJ5 *\/B*phCJOJPJQJ^Jo(aJ *nHtH/B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH     ѽmY?#7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ * +  " $ & 6 8 : < > B ɵkWC/'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH +B D F R T V X Z ^ ` b ׽yeQ7/B*phCJOJPJQJ^Jo(aJ *nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * +b n p r t v z | ɵyeQ73B*phCJOJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH + ǫsW;6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH ѽuaG+7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH      ǫsW;6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH . 2 4 < R T \ ^ j ǭ}cQ;)"CJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *"CJOJPJQJ^Jo(aJKH *3B*phCJOJPJQJ^Jo(aJKH *nHtH+B*phCJOJPJQJ^Jo(aJKH *3B*phCJOJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH j l t v mWA++B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *"CJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *"CJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH * + ӽ{eO9#+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH * + ӽ{eO97B*phCJOJQJ^Jo(aJKH *mH sH nHtH+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH * + "248:˯}aE/'B*phCJOJPJQJ^Jo(aJ *+B*phCJOJPJQJ^Jo(aJKH *7B*phCJOJQJ^Jo(aJKH *mH sH nHtH7B*phCJOJQJ^Jo(aJKH *mH sH nHtH+B*phCJOJPJQJ^Jo(aJKH *7B*phCJOJQJ^Jo(aJKH *mH sH nHtH7B*phCJOJQJ^Jo(aJKH *mH sH nHtH+B*phCJOJPJQJ^Jo(aJKH *;B*phCJOJPJQJ^Jo(aJKH *mH sH nHtH :<>@BDFHJLNïs_K7'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * +NRT\np|~ѷbF,3B*phCJOJPJQJ^Jo(aJKH *mH sH 7B*phCJOJQJ^Jo(aJKH *mH sH nHtH;B*phCJOJPJQJ^Jo(aJKH *mH sH nHtH7B*phCJOJQJ^Jo(aJKH *mH sH nHtH B*ph+B*phCJOJPJQJ^Jo(aJKH *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH ӽ{gS?+'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH *+B*phCJOJPJQJ^Jo(aJKH * + +׽gS93B*phCJOJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * + +(*8:ǫsW;6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:HLNPRVXtvǭyeK7#'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH vz|ũoQ5:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtHũwcO5!'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH ѽgS;''B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH +"$.08:BDïs_K7#'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * DNPXZbdnpxzïs_K7#'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * ïs_K13B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * +׻cK7 -B*phCJOJPJQJ^Jo(aJ5 *\'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * *,02:<D̸~bD(6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *=B*phCJOJPJQJ^Jo(aJ5 *mH sH nHtH\DFPTVX\^fŧ{_A%6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH*B*phCJOJPJQJ^Jo(aJH* **B*phCJOJPJQJ^Jo(aJH* *:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtHfhlnvz|ŧmV?(-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtHégS?+'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * + + ѵkQ5!'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *  "$,.2:<@BɵkQ5! B*ph'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH +BRT\^bdhj׻gK/6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *jnpǫqS92B*phCJOJPJQJ^Jo(aJH* *nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtHũoQ72B*phCJOJPJQJ^Jo(aJH* *nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH˯uW=#2B*phCJOJPJQJ^Jo(aJH* *nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH˯uW;:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH "$ũoQ5:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH$,024Z\^`dfűq]I53B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH +fh|~ѵ}^? =B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\1B*phCJOJPJQJ^Jo(aJ5KH *\=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\7B*phCJOJPJQJ^Jo(aJ *mH sH nHtH3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *b@@B*phCJOJQJ^Jo(aJ5>*KH *mH sH nHtH\BB*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH_H=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\AB*phCJOJPJQJ^Jo(aJ5KH *mH sH nHtH\=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\=B*phCJOJQJ^Jo(aJ5KH *mH sH nHtH\ ޼aI1.B*phCJOJPJQJ^Jo(aJ>*KH *.B*phCJOJPJQJ^Jo(aJ>*KH *.B*phCJOJPJQJ^Jo(aJ>*KH *;B*phCJOJPJQJ^Jo(aJKH *mH sH nHtH7B*phCJOJQJ^Jo(aJKH *mH sH nHtH@B*phCJOJQJ^Jo(aJ5>*KH *mH sH nHtH\BB*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH_H@B*phCJOJQJ^Jo(aJ5>*KH *mH sH nHtH\ 2ĬrV8 .B*phCJOJPJQJ^Jo(aJ>*KH *;B*phCJOJPJQJ^Jo(aJKH *mH sH nHtH7B*phCJOJQJ^Jo(aJKH *mH sH nHtH.B*phCJOJPJQJ^Jo(aJ>*KH *BB*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH_H.B*phCJOJPJQJ^Jo(aJ>*KH *BB*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH_H1B*phCJOJPJQJ^Jo(aJ>*H*KH *24Z\^`bfj϶|Z:>B*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH>B*phCJOJQJ^Jo(aJ>*KH *mH sH nHtH_HBB*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH_H.B*phCJOJPJQJ^Jo(aJ>*KH *BB*phCJOJPJQJ^Jo(aJ>*KH *mH sH nHtH_H1B*phCJOJPJQJ^Jo(aJ>*H*KH *.B*phCJOJPJQJ^Jo(aJ>*KH *.B*phCJOJPJQJ^Jo(aJ>*KH *jlԽ{gK-:B*phCJOJPJQJ^Jo(aJH* *mH sH nHtH6B*phCJOJQJ^Jo(aJH* *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *3B*phCJOJQJ^Jo(aJ *mH sH nHtH'B*phCJOJPJQJ^Jo(aJ *-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\'B*phCJOJPJQJ^Jo(aJ * yeE1'B*phCJOJPJQJ^Jo(aJ *?B*phCJOJPJQJ^Jo(aJKH *mH sH nHtH_H'B*phCJOJPJQJ^Jo(aJ */B*phCJOJPJQJ^Jo(aJ *nHtH/B*phCJOJPJQJ^Jo(aJ *nHtH/B*phCJOJPJQJ^Jo(aJ *nHtH'B*phCJOJPJQJ^Jo(aJ **B*phCJOJPJQJ^Jo(aJH* *'B*phCJOJPJQJ^Jo(aJ *   $&ѷu[UA-'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ * o(nHtH2B*phCJOJPJQJ^Jo(aJH* *nHtH'B*phCJOJPJQJ^Jo(aJ *2B*phCJOJPJQJ^Jo(aJH* *nHtH'B*phCJOJPJQJ^Jo(aJ *2B*phCJOJPJQJ^Jo(aJH* *nHtH'B*phCJOJPJQJ^Jo(aJ *2B*phCJOJPJQJ^Jo(aJH* *nHtH +8:ѺwcO;''B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *'B*phCJOJPJQJ^Jo(aJ *5B*phCJOJPJQJ^Jo(aJ5 *nHtH\-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\ +(*,0ʳjS?+'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\-B*phCJOJPJQJ^Jo(aJ5 *\5B*phCJOJPJQJ^Jo(aJ5 *nHtH\-B*phCJOJPJQJ^Jo(aJ5 *\5B*phCJOJPJQJ^Jo(aJ5 *nHtH\30JB*phCJOJPJQJ^Jo(aJ *nHtH 0268<>BDHJNPïs_K7 -B*phCJOJPJQJ^Jo(aJ5 *\'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH PRVX\^bdhjnpïs_K7#'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH'CJOJPJQJo(aJmH sH nHtH ptvxտypigb`OJC8CJPJ^JaJEH PJ^JRHZPJ^JCJOJo(aJmH sH nHtHo(PJ^Jo( PJ^JEHCJo(aJ5\CJPJ^JaJ5EH\CJo(aJ5EH\CJPJ^JaJ5EH\U CJOJaJ+CJOJPJQJ^Jo(aJmH sH nHtH+CJOJPJQJ^Jo(aJmH sH nHtHCJOJPJQJ^Jo(aJ CJOJaJ'CJOJPJQJo(aJmH sH nHtH $&(,28:<>@nprtvxz|~ǽ}xl^\WUPPJ^JUPJ^Jo(PJ^Jo(mH sH nHtH^Jo(mH sH nHtHPJ^Jo(PJ^Jo(PJ^J^JU mHsH^J^JU^J^JUPJ^Jo(CJPJ^JaJ5\CJo(aJ5\CJ^JaJ5\CJo(aJ5\PJ^JPJ^JCJPJ^JaJCJPJQJ^Jo(aJCJPJ^JaJ5\QJo(&(a$$-DM +$Ifa$$-DM +$Ifa$$-DM +$Ifda$$-DM +l^l$Ifda$$-DM +l^l$If-DM +^]$If(*,3$-DM +$If$$If:V 44844804f4%r= + %       555K5t5,.02a$$-DM +$Ifa$$-DM +$If-DM +$If2468J;,-DM +$If-DM +$If$$If:V 44844804f4%\= +%   555K5& 8:>BFJLPRT{vg-DM +$IfFfd@-DM +$Ifd@a$$-DM +$Ifd@-DM +$Ifd@-DM +$Ifd@a$$-DM +$Ifd@-DM +$Ifa$$-DM +$If TVX-DM +$Ifp$$If:V 44844804f4p%%  5%XZ\-DM +$Ifp$$If:V 44844804f4p%%  5%\^`-DM +$Ifp$$If:V 44844804f4p%%  5%`bd-DM +$Ifp$$If:V 44844804f4p%%  5%dfh-DM +$Ifp$$If:V 44844804f4%%  5%hjl-DM +$Ifp$$If:V 44844804f4z%%  5%lnp-DM +$Ifp$$If:V 44844804f4p%%  5%prvya$$ O-DM +$Ifp$$If:V 44844804f4p%%  5%vxzed@a$$-DM +$Ifd@a$$-DM +$Ifp$$If:V 44844804f4p%%  5%}a$$-DM +$Ifp$$If:V 44844804f4%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%z-DM +WDR`$Ifp$$If:V 44844804f4p%%  5%z-DM +WDR`$Ifp$$If:V 44844804f4p%%  5%q-DM +$If-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%-DM +$Ifp$$If:V 44844804f4p%%  5%  zeP;da$$-DM +$Ifda$$-DM +$Ifda$$-DM +$Ifda$$-DM +$Ifp$$If:V 44844804f4%%  5%   + J=+ ]$ ]$ +-DM + d-DM +$$If:V 44844804f4%\ +@x%      5 +5x5856 +  * 6 D N fD!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`2dpa$$A$ h$$4$5$6$3$-DM +VD;^;UDZ]Z`N X d p wU!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`  +~cHdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$If!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`( + + + + +" +( +* +sXdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$IfFfGdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$If* +, +. +0 +2 +4 +^ +X'dp$$4$5$6$3$-DM +A$VD^WDr`!dp$$4$5$6$3$-DM +A$]WD`!dp$$4$5$6$3$-DM +A$]WD`Ffdpa$$A$$$4$5$6$3$]$Ifdpa$$A$$$4$5$6$3$]$If^ +p +~ + +c3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o&3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o&3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o& + +$$If:V 44l44l    0    Y6"e4 6[oFa"    /  /  /   /   /   /  55s 5f + + + +??da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +VD^UD]$If[o&?da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +VD^UD]$If[o&?da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +VD^UD]$If[o& + + + K3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o&?da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +VD^UD]$If[o&?da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +VD^UD]$If[o&  . 6 8 : c^5(dpa$$A$$$4$5$6$3$-DM +$If[o&Ff3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o&3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o&3da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If[o&: < > @ B H [2(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&=$$If:V 44844804f4Q% = +!"'$%   $$$$ 555K5555 Ffm$$If:V4l4l0"rx#x /  /  /  /  /   /   /   /   /   /  55X555\FfG$$If:V4l4l0"ֈx #x /  /  /  /  /  /   /   /   /   /   /   /  5515'555\Ff$$If:V 44l44l    0    Z6"e4 6[oִ4 D@a"    /  /  /  /  /  /  /  /   /   /   /   /   /   /   /   /  5D5555555!Ff$$If:V 44l44l    0    p6"e4 6[o 4 D@a"$$$$ /  /  /  /  /  /  /  /   /    /   /   /   /   /   /   /   /   /   5D55555555 !FfO $$If:V 44l44l    0    66"H P R T V X J4dpa$$A$$$4$5$6$3$-DM +VD^WD?`?$If[o&FfO (dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&X Z \ ^ ` [(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&` b d f h j l ~UP8dp$$4$5$6$3$-DM +A$Ffi(dpa$$A$$$4$5$6$3$-DM +$If[o&(dpa$$A$$$4$5$6$3$-DM +$If[o&%dp$$4$5$6$3$-DM +A$$If[o&1dp$$4$5$6$3$-DM +A$VDwC^CWDc`$If[o&l sT5dpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If'dp$$4$5$6$3$-DM +A$VDF^FWD`'dp$$4$5$6$3$-DM +A$VDH^HWD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`   dpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If " $$If:V 44l44l0 ֈkj% "        k5555Z55" & 8 : < > @ dEdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If@ B $$If:V 44l44l0 ֈkj% "  k5555Z55B F T V X Z \ dEdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If\ ^ $$If:V 44l44l0 ֈkj% "  k5555Z55^ b p r t v x dEdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifx z $$If:V 44l44l0 ֈkj% "        k5555Z55z | ~gbFfdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`   mUdpa$$A$1$$$4$5$6$3$$Ifdpa$$A$1$$$4$5$6$3$$Ifdpa$$A$1$$$4$5$6$3$$If"dpa$$A$1$$$4$5$6$3$-DM +WD`"dpa$$A$1$$$4$5$6$3$-DM +WD`dp$$4$5$6$3$-DM +A$WD` 0 2 4 T ^ \*dpa$$A$1$$$4$5$6$3$-DM +$If + &"dpa$$A$1$$$4$5$6$3$-DM +WD`"dpa$$A$1$$$4$5$6$3$-DM +WD`Ffdpa$$A$1$$$4$5$6$3$$Ifdpa$$A$1$$$4$5$6$3$$If^ l v |R*dpa$$A$1$$$4$5$6$3$-DM +$If + &Ff*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &e4 6[o 4 D@a"$$$$ /  /  /  /  /  /  /  /   /    /   /   /   /   /   /   /   /   /   5D55555555 !Ffi$$If:V4l4l06"\x +[#x /  /  /  /   /   /   /   /  5Ffd$$If:V4l4l06"r sZA)$ /  /  /  /  /   /   /   /   /   /  5{5S +55Ff$$If:V 4444    0    6e4 6 + \f /  /  /  /   /   /   /   /  22222l2l2l2l22222l2l2l2l5i5LFf$$If:V 4444    0    6e4 6 + \f /  /  /  /   /   /   /   /  22222l2l2l2l22222l2l2l2l5i5LFf$$If:V 4444    0    6e4 6 + \f /  /  /  /   /   /   /   /  22222l2l2l2l22222l2l |R*dpa$$A$1$$$4$5$6$3$-DM +$If + &Ff*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + & |R*dpa$$A$1$$$4$5$6$3$-DM +$If + &Ffq*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + & |R*dpa$$A$1$$$4$5$6$3$-DM +$If + &Ff1 *dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + & |R*dpa$$A$1$$$4$5$6$3$-DM +$If + &Ff"*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + & +*dpa$$A$1$$$4$5$6$3$-DM +$If + & + $$If:V 4444    0    }6e4 6 + 0f /  /   /   /  222l2l222l2l55  *dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + & "$$If:V 4444    0    6e4 6 + 0f /  /   /   /  222l2l222l2l55"46*dpa$$A$1$$$4$5$6$3$-DM +$If + &*dpa$$A$1$$$4$5$6$3$-DM +$If + &68$$If:V 4444    0    6e4 6 + 0f /  /   /   /  222l2l222l2l558:<>@BDiKdp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`DFHJLp~e;*dpa$$A$1$$$4$5$6$3$-DM +$If &"dpa$$A$1$$$4$5$6$3$-DM +WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`~*dpa$$A$1$$$4$5$6$3$-DM +$If &$$If:V 4444    0    6e4 6 0D /  /   /   /  222l2l222l2l55 *dpa$$A$1$$$4$5$6$3$-DM +$If &*dpa$$A$1$$$4$5$6$3$-DM +$If &$$If:V 4444    0    6e4 6 0D /  /   /   /  222l2l222l2l55 *dpa$$A$1$$$4$5$6$3$-DM +$If &*dpa$$A$1$$$4$5$6$3$-DM +$If &$$If:V 4444    0    6e4 6 0D /  /   /   /  222l2l222l2l55 iKdp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD` +*:JLNmhIdpa$$A$$$4$5$6$3$-DM +`Ff%dpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$-DM +`NPRv|w`Idpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdp$$4$5$6$3$-DM +A$`dpa$$A$$$4$5$6$3$-DM +`dpa$$A$$$4$5$6$3$-DM +`x\dp$$4$5$6$3$-DM +A$`dp$$4$5$6$3$-DM +A$`dp$$4$5$6$3$-DM +A$`dp$$4$5$6$3$-DM +A$`Ff'(dpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$If$qG*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$Ifdp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$`$0:DPZW-*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If2l2l5i5LFfq$$If:V 4444    0    6e4 6 + \f /  /  /  /   /   /   /   /  22222l2l2l2l22222l2l2l2l5i5LFf1 $$If:V 4444    0    6e4 6 + \f /  /  /  /   /   /   /   /  22222l2l2l2l22222l2l2l2l5i5LFf"l$$If:V4l4l06 r=~ &"= /  /  /  /  /   /   /   /   /   /  555Y55lFf%$$If:V4l4l06@!ֈc V" /  /  /  /  /  /   /   /   /   /   /   /  555R555Ff'(M$$If:V 44l44l    0    "ֈ'qR #  ' /  /  /   /   /   /  5J5555J5Ff*M$$If:V 44l44l    0    x"ֈ'qR #  ' /  /  /   /   /   /  5J5555J5FfR-$$If:V4l4l0ZdpzWRFf**da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$If*da$$A$G$8$7$1$$$$9D4$5$6$3$H$-DM +$IfwL+dpa$$A$$$4$5$6$3$-DM +VDwC^CWDc`$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If+dpa$$A$$$4$5$6$3$-DM +VDwC^CWDc`$Ifdpa$$A$$$4$5$6$3$-DM +$Ifkdpa$$A$$$4$5$6$3$$Ifdpa$$A$$$4$5$6$3$$Ifdp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$FfR-+dpa$$A$$$4$5$6$3$-DM +VDwC^CWDc`$IfT6dp$$4$5$6$3$-DM +A$WD`$$If:V4l4l06"0J#J /  /   /   /  5X5,,2<FRy\?dpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$If&dpa$$A$$$4$5$6$3$-DM +VD^UDu]%dp$$@& 4$5$6$3$-DM +A$UD]WD`RTVX^hnxziLGFf1dpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$Ifdpa$$A$$$4$5$6$3$UDu]$IfFf/z|xO(dpa$$A$$$4$5$6$3$-DM +$Ifg &% +& Fdp$$4$5$6$3$-DM +A$^WD`dp$$4$5$6$3$-DM +A$WD`%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD`dp$$@&4$5$6$3$-DM +A$UDZ]Z^5(dpa$$A$$$4$5$6$3$-DM +$Ifg &(dpa$$A$$$4$5$6$3$-DM +$Ifg &x$$If:V 44l44l    0     !e4 6g  5 ! pG(dpa$$A$$$4$5$6$3$-DM +$Ifg &(dpa$$A$$$4$5$6$3$-DM +$Ifg &$$If:V 44l44l    0     !e4 6g 0 55(dpa$$A$$$4$5$6$3$-DM +$Ifg &(dpa$$A$$$4$5$6$3$-DM +$Ifg &"F(dpa$$A$$$4$5$6$3$-DM +$Ifg &$$If:V 44l44l    0      !e4 6g \[ 5B5C5E"$.0(dpa$$A$$$4$5$6$3$-DM +$Ifg &(dpa$$A$$$4$5$6$3$-DM +$Ifg &(dpa$$A$$$4$5$6$3$-DM +$Ifg &02<F(dpa$$A$$$4$5$6$3$-DM +$Ifg &$$If:V 44l44l    0      !e4 6g \[ 5B5C5E<>@BG)dp$$4$5$6$3$-DM +A$WD`$$If:V 44l44l    0     !e4 6g 0 55(dpa$$A$$$4$5$6$3$-DM +$Ifg &BT^djpoR5 +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If) +& Fdpa$$A$1$$$4$5$6$3$C$VD^WD`$If' +& Fdpa$$A$1$$$4$5$6$3$C$^WD8\`\$If" +& Fdp$$4$5$6$3$-DM +A$C$WD` +& Fdpa$$A$1$$$4$5$6$3$C$$If6"\I?$I /  /  /  /   /   /   /   /  55 +5 +5 +Ff/$$If:V4l4l06"ֈIG?$I /  /  /  /  /  /   /   /   /   /   /   /  55 +55:55:Ff1l$$If:V4l4l06#rI x$ I /  /  /  /  /   /   /   /   /   /  5~5555PFf4$$If:V4l4l06#ֈI x$ I /  /  /  /  /  /   /   /   /   /   /   /  5~5555 5; Ff 7$$If:V4l4l06#  I xzo]"$ I0000 /  /  /  /  /  /  /  /   /    +/ +  + / +   /   /   /   /   /   /   /   /   /   /   + / +  + / +  /  5~5555555 5 +5 + 5 Ff9!$$If:V 44l44l    0    2!\-# %$$If:V4l4l06#FI$`I    /  /  /   /   /   /  5~55niL +& Fdpa$$A$1$$$4$5$6$3$C$$IfFf4 +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$IfniL +& Fdpa$$A$1$$$4$5$6$3$C$$IfFf 7 +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$IfnQ +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If$.02niQdp$$4$5$6$3$-DM +A$Ff9 +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If +& Fdpa$$A$1$$$4$5$6$3$C$$If24\^`~oN dpa$$A$1$$$4$5$6$3$-DM +$Ifdp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$WD^`dp$$4$5$6$3$-DM +A$WD^`dp$$4$5$6$3$-DM +A$WD`dp$$4$5$6$3$-DM +A$vU da$$A$1$$$4$5$6$3$-DM +$If dpa$$A$1$$$4$5$6$3$-DM +$IfFf> dpa$$A$1$$$4$5$6$3$-DM +$If dpa$$A$1$$$4$5$6$3$-DM +$If dpa$$A$1$$$4$5$6$3$-DM +$IfvU da$$A$1$$$4$5$6$3$-DM +$If da$$A$1$$$4$5$6$3$-DM +$If da$$A$1$$$4$5$6$3$-DM +$IfFf +A dpa$$A$1$$$4$5$6$3$-DM +$If dpa$$A$1$$$4$5$6$3$-DM +$If4^vU da$$A$1$$$4$5$6$3$-DM +$If da$$A$1$$$4$5$6$3$-DM +$If da$$A$1$$$4$5$6$3$-DM +$IfFf5C da$$A$1$$$4$5$6$3$-DM +$If dpa$$A$1$$$4$5$6$3$-DM +$If^`hjluYBdpa$$A$$$4$5$6$3$$Ifdp$$4$5$6$3$-DM +A$`%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD`dp$$4$5$6$3$-DM +A$WD`Ff`E da$$A$1$$$4$5$6$3$-DM +$If dpa$$A$1$$$4$5$6$3$-DM +$If=!dp$$4$5$6$3$-DM +A$`$$If:V4l4l06"0%$ /  /   /   /  5F5>dpa$$A$$$4$5$6$3$$IfqRdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If'dp$$4$5$6$3$-DM +A$VD^WDr`'dp$$4$5$6$3$-DM +A$VD^WDr`"$&qL%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD`%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD`#dp$$4$5$6$3$-DM +A$VD;0^0WDe`eFfGdpa$$A$$$4$5$6$3$-DM +$Ifdpa$$A$$$4$5$6$3$-DM +$If:eA#dp$$4$5$6$3$-DM +A$VD,^WD8Z`Z%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD?`?%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD?`?%dp$$@&4$5$6$3$-DM +A$UDZ]ZWD?`?+dp$$@&4$5$6$3$-DM +A$VD^UDZ]ZWDK`K*,.a$$$If&a$$$If&+dp$$@&4$5$6$3$-DM +A$VDJ^JUDZ]ZWD8Z`Z.024p]Ja$$$If&a$$$If&$$If:V 44l44l0 r$e4 60$5k5468:p]Ja$$$If&a$$$If&$$If:V 44l44l0r$e4 60$5k5:<>@p]Ja$$$If&a$$$If&$$If:V 44l44l03 r$e4 60$5k5@BDFp]Ja$$$If&a$$$If&$$If:V 44l44l0r$e4 60$5k5FHJLp]Ja$$$If&a$$$If&$$If:V 44l44l0B +r$e4 60$5k5LNPRpE2a$$$If&+dp$$@&4$5$6$3$-DM +A$VDH^HUDZ]ZWD8\`\$$If:V 44l44l0r$e4 60$5k5RTVXZ]J7a$$$If&a$$$If&$$If:V 44l44l0 r$e4 60$5k5a$$$If&Z\^`p]Ja$$$If&a$$$If&$$If:V 44l44l0r$e4 60$5k5`bdfp]Ja$$$If&a$$$If&$$If:V 44l44l03 r$e4 60$5k5tC tC  tC &8x<< +66 +666666 0@P`p6866 0@P`p 0@P`p 0@P`p 0@P`p 0@P`p 0@P`pZ@Zcke a$$1$0CJOJPJQJ^JaJKHmH sH nHtH_Ht@t0h 13a$$8$7$$@&9DH$<^0`0CJOJaJ5KHnHtH\$A@$؞k=W[SONi@Nnfh?@ABCDEFGHIJKLMNOPQ(,28TX\`dhlpv + N  +* +^ + + + + : H X ` l " @ B \ ^ x z  ^  +  "68D~N$ZRz"0<B2^.4:@FLRZ`flr&RSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~I7$.{$  Calibri-([SOG.[x @Times New RomanWPS_1615305698WPS_1615305698 Qh$ȇ@G#f!),.:;?]}    & 6"0000   +   ! /"#$%&')*+,-.012fhjlp]Ja$$$If&a$$$If&$$If:V 44l44l0r$e4 60$5k5lnprp]Ja$$$If&a$$$If&$$If:V 44l44l0B +r$e4 60$5k5rtvxpnW> 9r a$$ 9r 4$&dP 9r a$$ 9r &dP$$If:V 44l44l0r$e4 60$5k5a$$VDh^WD`$If a$$$If d@a$$$Ifda$$l^l$Ifda$$l^l$Ifa$$^]$If 9r a$$ 9r &dP3*! a$$$If a$$$If$$If:V 44844804f4%r= +)!%       555K55"$&8/ a$$$If$$If:V 44844804f4%\= +%  555K5& a$$$If a$$$If&(:>vz~ 9r a$$ 9r &dPFfI d@a$$$If d@a$$$If d@a$$$If d@a$$$If d@a$$$If d@a$$$If a$$$If a$$$If ~ 0. A!#S"S$7%0p1F+p4,p5-p6.p7/R0P. A!#S"M$%S0p1F+p4,p5-p6.p7/RF +kO lJFIFC    + + + + + + + + +C + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Z_" + }!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + w!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?/cPxRu6seԭh$^;n.tl/mᑒhd\208*Gb"?c"@l?}u7K>ோ|/Kw'TVR t3:߄[dOm#ynHR@=$s(FE+O)7$\?h=Z>hiޕm#K;N}[mK𯇯K\yVz}Rm'lhN<ko`o+ gzަx]B$T'eryp0Y>+~x>ڟv_]yK#kϏ+.k_7>؈W]%&_- Rh-Ky|~\>?73h-=9ʒc`I*qM8v5_m<=⏇iOclHt[{kpNI&"O&Ho? 5ך/tP;KK8*P(kSPkh_?\#h0k>f?Vx #Ě\xisdc">>x#Ú76N 2Mm.:b?B߱6"jkYCEwgqG"p~$ĚKZ_H3qZh#2]F3X3U3Vۇ o;>XinV-)nIozdPB7_Z/!Fχį-W͟yg& 7eWhxlêX1-GDaM-ltopi]`1.z*O&\>">)a((xAPG?o  +wsω /xBO^̪"8o=hWpݤY8 + "n<<͓-it4Wi<%w"Ep/-` #3Tfj|z8oҀ6hK@Q@Q@g]H[$rރd^Y> K.Ue #;OUl{@_/ ]G%!5KVg5k> +o#F93ߥR KCAh?h KCAh?h¿5#1<ȝOzt'Cjh-C2 #u<2k*oҮdΞBcў\Q@E K@Q@Q@Q@!u/"id=p2hƾ=--U<G҂A6 S#%yCอ`n tqۡ_z@@ EPEPEP^7 be#S9bn? |?xYՅl2K@vGOZ Qv2#_ BHȶT W:v +OmsbU'@E|/ v:3,35. + +(K KͿѯmBPzLĈ}}zkO "gl\7@Q_ExxmJrD74d*?ku_2ҝLZy@=Я|X4kLȿyE>_l{ُm{"#C1oB6:)rp=A5K_i27'9@p]@ EPEP[㯅?Go +8Y7~y{k>!xi|W9P_6Pp9㑕lS䍢aʜtPEPEP{_xϐ-&U G<  >__+ppglji,nD9$Osh)h(kcz +/0~K+ /lxFA$0s7W:ai2G1Ͽ?B++믊7QC{Q#\Fe(Xa((M)k̩HȲ/U9zW-'eo >*(86=멠(Y꺏ltSO([#MoQ^ ⟏K&{($ؒLY=@;քI2sG([?V|K@''Ŀ ? +Q +Uh'I$/tO.*__k'Ŀ ?Oh'I$g+<ȼ)[=*0dkf_sW@Á<[;o +vW.cZa5or_[(uor_[(uor]2kuoGGt9vxO<4.fu9 8d+¾Ko +_ZHKdzюy۽GN)QE0 +( +( +( +( +kuV/5;CV-`gPWlƀ>~4+Igg1wwWTsOys#I<4;brIj +|*qbZVi$6P`lxY4QEQEW_ٵ NefH1#ּRh.k>٭Yzwax^oAhՂkOadY}wC-H1\$= +x6Ǡ#2xyO^8uvоu(?1_6H|?@Q ^~bm>?1G4/yKK?1^OMj$b$?G?ݿGշ =^0g%OF\W5߳߉ ڇ,Z#2II +۝}M{-QEQEQEQE㟴&%4`p +F~kOZ:B~f"!]cyEUNW4؈]Nn@K wÑ`eWP DGU 2f9,v3lc>e@fFNoJbnFKR}KK,LE LMpqNdxQbh>RKRiEaSTt.UbqMVqmV*.kZV^qZ~Z]0]E^H^9\C_%B`+`]4ua"za4NaNXa[dUfY^gRh)h:EAhm.iVPkNIl 6mS|n>n%qsrq tG tq>td)ti@yz%~7I$$$$$$   +/XR$ +kO lR$J#s? (  +x +  + FA(8? +VGr 2"* +3 ?6 (  +x + + FA(8? +VGr 1"f + +s 4((jJ +wb_ 3"I KT$IKT%s5td|~I!]username projectNofromcode projectname CountPage reportAlldate reportindexquamanagername +createdate lbProjectNamelblMainUnitNamelblProjectAddresslblProjectCode lblContractNolblProjectType lblWorkRange lblDuration lblStartDate +lblEndDatetab1 MonthHSEDay SumHSEDayMonthHSEWorkDayYearHSEWorkDay SumHSEWorkDay HseManhoursSubcontractManHoursTotalHseManhoursYearTotalHseManhours classhours1 traincounts1 traincounts4 traincounts7 classhours2 traincounts2 traincounts5 classhours3 traincounts3 traincounts6nbFireWorkCountnbBreakGroundCountnbLimitedSpaceCountnbElectricityCountnbHeightWorkCount nbRadialWorknbLiftingWorkCount nbNightWork nbMonthCount nbYearCount +nbProCountMonthExpertNoCountMonthExpertCountEmergencyManagementWorkDef RewardNum RewardMoneyProjectRewardMoney PunishNum PunishMoneyProjectPunishMoney +WhMonthNum FbsMonthNum WhYearNum +FbsYearNumProNumDefGoalach1Goalach2Goalach3Question ImageUrl1 ImageUrl2 ImageContent1 ImageContent2 ImageUrl3 ImageUrl4 ImageContent3 ImageContent4 ImageUrl5 ImageUrl6 ImageContent5 ImageContent6 ImageUrl7;QE((_#"76a ą}*x+ɵn]y ԒsP#8$d`PEPEPE2x:pV0o;)#lc9|/1x,\bFV^C!GsE|}gz#bb-dE}ikj0'HZN @Awcᖰ'M$ḾO +U3P+i՝_WB ݴs(l~@Q@Q@Q@Q@ZؼH$XU|zIq993@v졿E8ܨ0$Fe@"#g ?7hTuM:VӮt-f7{xR¼ +( +( +( +( +( +SG?;.s.olyJynk%O{&߃<39f |bг Kt FU ++ɿh+c/X47KuJ8?ߍQ$ FvdQh(>Ms% YG"&s*k9$CvoPEPEPEPEP_J5ɽNO_e)~&"mKb.IΫо HS@ĉ2ylyn3R]#ƺ5b6d7~-dxF:q."ꭏb5+ J3HѺW|­i[>Ua"}h袊((((_-4T5āAqP|Iq$Ͷ{?3b@kۗgUimXԜeG+<܈>:WRzj?h,ާ T5PEPEPEPEP^EMiWrUUG~vꁧOCɒzw+~4 *8 RQ@e?#.Јg >V'nkg(H\ 2HkA@ \4멭|E"+[E`;Kgux#+Uț-o1u skYy&䑋33d{@֟4ìL8̯YCSιM9F)i-QEQEQEQEQ@G, +H|SsI8s܊ꏌ~ o_Vtd:z#Lw =u緑e>VSy?|Um [j(F|.AuE|a]ß}tP˧.^ nRYmwG*:~< +>#xc^im>besvku5b Yh/4cj_?kj(mK|g ڗ|gRG6>3梀>uٟ\_l:FہW@5:Қ_Ƌi'{2|G<9962gLӝY\4ncqusyrNO8$ |gF;˯s[!Bv9G P6p@!~X=}T(GJZ((((((Q_0|av.α,:)ӵ}CYڶe_ۭŬHpG_=A@Q]OՎͥ?ތ?Zu27)[^&-z0#- _|E-v6d<;Xv8#_|[GPzMDIdG̽ؠ()^HfUf>QD572 PQEQEQI@ Mc\ϊ. pa~us;<$1gw9f'&$OZ(6yjefK }=w1#DIf$;È< k(<8>P8>X#u-P4B? K@Q@Q@Q@Q@Q@Q@Q@Ƒc\Z +ocG"^Q]ėvgգ={g>v[oqK Uuܮw(GA<+&9 r~E{!)?&o.~7 O[8<7$3J +X 0R}H3at 67BJ8B}rFk|P/߲smŒ +I퀧o^ៅq svwrBAPA#ֻ(0)Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@ /  /  /  /   /   /   /   /  5K55%5Ff>!$$If:V 44l44l    0    t2!\-#  /  /  /  /   /   /   /   /  5K55%5Ff +A!$$If:V 44l44l    0    2!\-#  /  /  /  /   /   /   /   /  5K55%5Ff5C!$$If:V 44l44l    0    2!\-#  /  /  /  /   /   /   /   /  5K55%5Ff`Eh$$If:V4l4l06"rJ#J /  /  /  /  /   /   /   /   /   /  55 55FfG=$$If:V 44844804f4% = +!"'$%            $$$$ 555K5555 FfI ImageUrl8 ImageContent7 ImageContent8 ImageUrl9 +ImageUrl10 ImageContent9ImageContent10 +ImageUrl11 +ImageUrl12ImageContent11ImageContent12%OU|*+,89:VdCDEFGH +/I +  !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\%OU|*+,89:VdCDEFGH +/I +commondata,<eyJoZGlkIjoiZmNlMzdjZTlhZTdlYTdjOTEyOTBhY2M0ODZhNGIyYWUifQ==@ \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 7efa2411..29220861 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1195,6 +1195,8 @@ + + @@ -12782,6 +12784,20 @@ ManagerMonthC.aspx + + ManagerMonthCEdit.aspx + ASPXCodeBehind + + + ManagerMonthCEdit.aspx + + + ManagerMonthCNew.aspx + ASPXCodeBehind + + + ManagerMonthCNew.aspx + ManagerMonth_SeDin.aspx ASPXCodeBehind @@ -19216,7 +19232,7 @@ - + - - - - + + + + - + - + - + - + - - - + + + - + - + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index d162082b..89e47133 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -57,6 +57,9 @@ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll + @@ -124,6 +127,9 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll + + ..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll + True ..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -142,7 +148,9 @@ + + diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 5fe155da..c2dcc265 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -10,8 +10,8 @@ FolderProfile - ApiControllerEmptyScaffolder - root/Controller + MvcControllerEmptyScaffolder + root/Common/MVC/Controller 600 True False diff --git a/SGGL/WebAPI/packages.config b/SGGL/WebAPI/packages.config index d3d18c70..d3dda5e0 100644 --- a/SGGL/WebAPI/packages.config +++ b/SGGL/WebAPI/packages.config @@ -25,5 +25,8 @@ + + + \ No newline at end of file