From 430682519327e0e9fb7e7c7d4dd5ff74c57a9447 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Mon, 22 May 2023 14:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-05-20.sql | 260 +++++++++++++++ SGGL/BLL/BaseInfo/TrainTypeService.cs | 6 +- SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx | 3 +- .../BaseInfo/AccidentType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx | 3 +- .../BaseInfo/Certificate.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/CostType.aspx | 3 +- .../BaseInfo/CostType.aspx.designer.cs | 2 +- .../FineUIPro.Web/BaseInfo/EmergencyType.aspx | 3 +- .../BaseInfo/EmergencyType.aspx.designer.cs | 2 +- .../FineUIPro.Web/BaseInfo/GoodsCategory.aspx | 3 +- .../BaseInfo/GoodsCategory.aspx.designer.cs | 2 +- .../BaseInfo/HSSEStandardListType.aspx | 3 +- .../HSSEStandardListType.aspx.designer.cs | 2 +- .../BaseInfo/LawsRegulationsType.aspx | 3 +- .../LawsRegulationsType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx | 3 +- .../BaseInfo/LicenseType.aspx.designer.cs | 2 +- .../BaseInfo/ManageRuleType.aspx | 3 +- .../BaseInfo/ManageRuleType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx | 3 +- .../BaseInfo/PictureType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/Position.aspx | 3 +- .../BaseInfo/Position.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx | 3 +- .../BaseInfo/PostTitle.aspx.designer.cs | 2 +- .../BaseInfo/PracticeCertificate.aspx | 3 +- .../PracticeCertificate.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx | 3 +- .../BaseInfo/ProjectType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx | 3 +- .../BaseInfo/QuestionType.aspx.designer.cs | 2 +- .../BaseInfo/RulesRegulationsType.aspx | 3 +- .../RulesRegulationsType.aspx.designer.cs | 2 +- .../BaseInfo/SolutionTempleteType.aspx | 3 +- .../SolutionTempleteType.aspx.designer.cs | 2 +- .../BaseInfo/SpecialEquipment.aspx | 3 +- .../SpecialEquipment.aspx.designer.cs | 2 +- .../BaseInfo/SpecialSchemeType.aspx | 3 +- .../SpecialSchemeType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx | 3 +- .../BaseInfo/TrainLevel.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx | 207 ++++++------ SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.cs | 34 ++ .../BaseInfo/TrainType.aspx.designer.cs | 20 +- SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx | 3 +- .../BaseInfo/UnitType.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx | 3 +- .../BaseInfo/WorkPost.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx | 3 +- .../BaseInfo/WorkStage.aspx.designer.cs | 2 +- .../Controls/ChartControl.ascx.cs | 1 + SGGL/FineUIPro.Web/ErrLog.txt | 300 ++++++++++++++++++ .../JDGL/CostAnalysis/JDReport.aspx | 28 +- .../JDGL/CostAnalysis/JDReport.aspx.cs | 55 ++-- .../CostAnalysis/JDReport.aspx.designer.cs | 9 - 56 files changed, 818 insertions(+), 217 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-05-20.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-05-20.sql b/DataBase/版本日志/SGGLDB_WH_2023-05-20.sql new file mode 100644 index 00000000..dc43b825 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-05-20.sql @@ -0,0 +1,260 @@ + +CREATE TABLE [dbo].[Meeting_CompanySafetyMeeting]( + [CompanySafetyMeetingId] [nvarchar](50) NOT NULL, + [CompanySafetyMeetingCode] [nvarchar](50) NULL, + [CompanySafetyMeetingName] [nvarchar](50) NULL, + [CompanySafetyMeetingDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + [CompanySafetyMeetingContents] [nvarchar](max) NULL, + [CompileDate] [datetime] NULL, + [AttentPersonNum] [int] NULL, + [MeetingHours] [decimal](9, 1) NULL, + [MeetingHostMan] [nvarchar](50) NULL, + [AttentPerson] [nvarchar](300) NULL, + [MeetingPlace] [nvarchar](200) NULL, + [MeetingHostManId] [nvarchar](50) NULL, + [AttentPersonIds] [nvarchar](4000) NULL, + [MeetingHostManOther] [nvarchar](500) NULL, + CONSTRAINT [PK_Meeting_CompanySafetyMeeting] PRIMARY KEY CLUSTERED +( + [CompanySafetyMeetingId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingContents' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHours' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingPlace' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonIds' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManOther' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵί' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting' +GO + + + +CREATE TABLE [dbo].[Meeting_CompanySpecialMeeting]( + [CompanySpecialMeetingId] [nvarchar](50) NOT NULL, + [CompanySpecialMeetingCode] [nvarchar](50) NULL, + [CompanySpecialMeetingName] [nvarchar](50) NULL, + [CompanySpecialMeetingDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + [CompanySpecialMeetingContents] [nvarchar](max) NULL, + [CompileDate] [datetime] NULL, + [AttentPersonNum] [int] NULL, + [MeetingHours] [decimal](9, 1) NULL, + [MeetingHostMan] [nvarchar](50) NULL, + [AttentPerson] [nvarchar](300) NULL, + [MeetingPlace] [nvarchar](200) NULL, + [MeetingHostManId] [nvarchar](50) NULL, + [AttentPersonIds] [nvarchar](4000) NULL, + [MeetingHostManOther] [nvarchar](500) NULL, + CONSTRAINT [PK_Meeting_CompanySpecialMeeting] PRIMARY KEY CLUSTERED +( + [CompanySpecialMeetingId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingContents' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHours' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingPlace' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonIds' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManOther' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵר' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting' +GO + + + +CREATE TABLE [dbo].[Meeting_SafetyLeaderGroupMeeting]( + [SafetyLeaderGroupMeetingId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [SafetyLeaderGroupMeetingCode] [nvarchar](50) NULL, + [SafetyLeaderGroupMeetingName] [nvarchar](50) NULL, + [SafetyLeaderGroupMeetingDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + [SafetyLeaderGroupMeetingContents] [nvarchar](max) NULL, + [CompileDate] [datetime] NULL, + [States] [char](1) NULL, + [AttentPersonNum] [int] NULL, + [MeetingHours] [decimal](9, 1) NULL, + [MeetingHostMan] [nvarchar](50) NULL, + [AttentPerson] [nvarchar](300) NULL, + [MeetingPlace] [nvarchar](200) NULL, + [UnitId] [nvarchar](50) NULL, + [MeetingHostManId] [nvarchar](50) NULL, + [AttentPersonIds] [nvarchar](4000) NULL, + [MeetingHostManOther] [nvarchar](500) NULL, + CONSTRAINT [PK_Meeting_SafetyLeaderGroupMeeting] PRIMARY KEY CLUSTERED +( + [SafetyLeaderGroupMeetingId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȫ쵼С' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting' +GO + + + +CREATE TABLE [dbo].[Emergency_EmergencyList_Unit]( + [EmergencyListId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [EmergencyCode] [nvarchar](50) NULL, + [EmergencyName] [nvarchar](500) NULL, + [UnitId] [nvarchar](50) NULL, + [EmergencyTypeId] [nvarchar](50) NULL, + [VersionCode] [nvarchar](50) NULL, + [EmergencyContents] [nvarchar](max) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [States] [char](1) NULL, + [AttachUrl] [nvarchar](2000) NULL, + [AuditMan] [nvarchar](50) NULL, + [ApproveMan] [nvarchar](50) NULL, + CONSTRAINT [PK_EmergencyList_Unit_EmergencyListId] PRIMARY KEY CLUSTERED +( + [EmergencyListId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + + + +CREATE TABLE [dbo].[Emergency_DrillRecordList_Unit]( + [DrillRecordListId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [DrillRecordCode] [nvarchar](50) NULL, + [DrillRecordName] [nvarchar](500) NULL, + [UnitIds] [nvarchar](4000) NULL, + [UnitNames] [nvarchar](4000) NULL, + [UserIds] [nvarchar](4000) NULL, + [UserNames] [nvarchar](4000) NULL, + [DrillRecordDate] [datetime] NULL, + [DrillRecordContents] [nvarchar](max) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [States] [char](1) NULL, + [AttachUrl] [nvarchar](2000) NULL, + [DrillRecordType] [char](1) NULL, + [JointPersonNum] [int] NULL, + [DrillCost] [decimal](9, 2) NULL, + CONSTRAINT [PK_DrillRecordList_Unit_DrillRecordListId] PRIMARY KEY CLUSTERED +( + [DrillRecordListId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + + diff --git a/SGGL/BLL/BaseInfo/TrainTypeService.cs b/SGGL/BLL/BaseInfo/TrainTypeService.cs index 565c5267..a7b72b8b 100644 --- a/SGGL/BLL/BaseInfo/TrainTypeService.cs +++ b/SGGL/BLL/BaseInfo/TrainTypeService.cs @@ -21,7 +21,7 @@ namespace BLL { return Funs.DB.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == trainTypeId); } - + /// /// 添加培训类型 /// @@ -34,6 +34,7 @@ namespace BLL TrainTypeId = trainType.TrainTypeId, TrainTypeCode = trainType.TrainTypeCode, TrainTypeName = trainType.TrainTypeName, + TrainType = trainType.TrainType, Remark = trainType.Remark, IsAboutSendCard = trainType.IsAboutSendCard, IsRepeat = trainType.IsRepeat @@ -54,6 +55,7 @@ namespace BLL { newTrainType.TrainTypeCode = trainType.TrainTypeCode; newTrainType.TrainTypeName = trainType.TrainTypeName; + newTrainType.TrainType = trainType.TrainType; newTrainType.Remark = trainType.Remark; newTrainType.IsAboutSendCard = trainType.IsAboutSendCard; newTrainType.IsRepeat = trainType.IsRepeat; @@ -92,7 +94,7 @@ namespace BLL { return (from x in Funs.DB.Base_TrainType orderby x.TrainTypeCode select x).ToList(); } - + /// /// 获取关联人员发卡的培训类型列表 /// diff --git a/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx b/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx index 6576e971..0d440849 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx.designer.cs index a2812fe1..d432a433 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtAccidentTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx index eb9b7276..88596515 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs index 414ea9ff..b5278e7f 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtCertificateCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx b/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx index f0ecd1f9..03c405ac 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.designer.cs index 584e5a99..db7c9f4c 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtCostTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx b/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx index 07eccd57..886e1719 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx.designer.cs index d36dd829..4e6591d8 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtEmergencyTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx b/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx index de57d855..968c1dad 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx @@ -57,8 +57,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx.designer.cs index ad9c215b..8cd52f13 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtGoodsCategoryCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx b/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx index af628a26..7c2d280a 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx @@ -57,8 +57,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx.designer.cs index 4a878632..b793a037 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx.designer.cs @@ -100,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// tbxTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx b/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx index cfb8525c..246e5297 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx.designer.cs index 1ac6064a..c27dfc1b 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx b/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx index 63f78085..194dc157 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx.designer.cs index ce89fb3f..2c9c52c3 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtLicenseTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx b/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx index 3ec3c911..7bfa3e90 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx @@ -51,8 +51,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx.designer.cs index 125a9bd6..a9f0c94c 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtManageRuleTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx b/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx index 8e0cc889..d507d886 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx @@ -53,8 +53,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx.designer.cs index 09b531eb..9e405b88 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx.designer.cs @@ -100,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/Position.aspx b/SGGL/FineUIPro.Web/BaseInfo/Position.aspx index 5064af94..785df760 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Position.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/Position.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/Position.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/Position.aspx.designer.cs index e4a83ddb..3386272c 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Position.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/Position.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtPositionCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx b/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx index bb186761..efaf9ab1 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx @@ -55,8 +55,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx.designer.cs index 80dbb45f..1cec4368 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx.designer.cs @@ -100,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtPostTitleCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx b/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx index 8549bf06..674f85e9 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx @@ -46,8 +46,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx.designer.cs index 51a9ab28..a8311a64 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtPracticeCertificateCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx b/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx index 4d8dfbe5..6aa41c98 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx @@ -46,8 +46,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx.designer.cs index 1d1a9235..47f0be34 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtProjectTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx b/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx index 145df676..755dce5b 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx @@ -52,8 +52,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx.designer.cs index d718d2c3..d5504e00 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtQuestionTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx b/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx index 3d6cbe20..7ea54275 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx.designer.cs index abac0871..28f4a673 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtRulesRegulationsTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx b/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx index dbbce300..786362fc 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx @@ -48,8 +48,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx.designer.cs index 71d22195..d13b8de3 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtSolutionTempleteTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx b/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx index c57aa24c..54c724a2 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx @@ -62,8 +62,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx.designer.cs index a579dd3f..ff8d4163 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtSpecialEquipmentCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx b/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx index cfab77be..c8402224 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx @@ -51,8 +51,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx.designer.cs index 2a23173b..c53cc1eb 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtSpecialSchemeTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx b/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx index 590d34eb..39d9bfe8 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx @@ -46,8 +46,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx.designer.cs index 29b1926c..33d89aa7 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtTrainLevelCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx b/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx index 321baddd..a999ee5c 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx @@ -5,104 +5,117 @@ 培训类型 - +
- - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.cs index 5800442c..ce116ec8 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.cs @@ -13,6 +13,7 @@ namespace FineUIPro.Web.BaseInfo { ////权限按钮方法 this.GetButtonPower(); + Funs.FineUIPleaseSelect(this.drpTrainType); Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); // 绑定表格 @@ -210,6 +211,10 @@ namespace FineUIPro.Web.BaseInfo { newTrainType.IsRepeat = false; } + if (this.drpTrainType.SelectedValue != BLL.Const._Null) + { + newTrainType.TrainType = this.drpTrainType.SelectedValue; + } newTrainType.Remark = txtRemark.Text.Trim(); if (string.IsNullOrEmpty(strRowID)) { @@ -332,5 +337,34 @@ namespace FineUIPro.Web.BaseInfo PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainTypeEdit.aspx?TrainTypeId={0}", Grid1.SelectedRowID, "设置 - "))); } + + #region 格式化字符串 + /// + /// 格式化字符串 + /// + /// + /// + protected string ConvertTrainType(object TrainType) + { + string name = string.Empty; + if (TrainType != null) + { + string trainType = TrainType.ToString().Trim(); + if (trainType == "1") + { + name = "三级安全教育培训"; + } + else if (trainType == "2") + { + name = "专项培训"; + } + if (trainType == "3") + { + name = "特种作业培训"; + } + } + return name; + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.designer.cs index f483866a..d8ee5fdf 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.designer.cs @@ -48,6 +48,15 @@ namespace FineUIPro.Web.BaseInfo { /// protected global::FineUIPro.Grid Grid1; + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + /// /// ToolbarSeparator1 控件。 /// @@ -91,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtTrainTypeCode 控件。 @@ -111,6 +120,15 @@ namespace FineUIPro.Web.BaseInfo { /// protected global::FineUIPro.TextBox txtTrainTypeName; + /// + /// drpTrainType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpTrainType; + /// /// ckbIsAboutSendCard 控件。 /// diff --git a/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx b/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx index 607ac76e..7ec23dc6 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx @@ -45,8 +45,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx.designer.cs index cadb4d6d..c3adfddc 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtUnitTypeCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx b/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx index 01241830..47aa17f6 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx @@ -68,8 +68,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs index 8b687935..d7d3b7a1 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs @@ -109,7 +109,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// drpWorkPostCode 控件。 diff --git a/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx b/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx index 0338e232..9330873d 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx @@ -47,8 +47,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx.designer.cs index e963c0df..ab6f698c 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx.designer.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo { /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hfFormID; + protected global::FineUIPro.TextBox hfFormID; /// /// txtWorkStageCode 控件。 diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs index 17a07139..9cb24382 100644 --- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs @@ -208,6 +208,7 @@ namespace Web.Controls chartArea.AxisY.IsLabelAutoFit = false; chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular); chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular); + chartArea.AxisY.LabelStyle.Format = "#(万元)"; chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64); chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64); chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 3c280d4f..e2a3e182 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -322,3 +322,303 @@ IP地址:::1 出错时间:05/17/2023 16:36:26 出错时间:05/17/2023 16:36:26 + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2157 +出错时间:05/20/2023 12:47:17 +出错时间:05/20/2023 12:47:18 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2022 +出错时间:05/20/2023 12:47:18 +出错时间:05/20/2023 12:47:18 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1918 +出错时间:05/20/2023 12:47:18 +出错时间:05/20/2023 12:47:18 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1860 +出错时间:05/20/2023 12:47:18 +出错时间:05/20/2023 12:47:18 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2157 +出错时间:05/20/2023 14:47:17 +出错时间:05/20/2023 14:47:17 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2022 +出错时间:05/20/2023 14:47:17 +出错时间:05/20/2023 14:47:17 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1918 +出错时间:05/20/2023 14:47:17 +出错时间:05/20/2023 14:47:17 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1860 +出错时间:05/20/2023 14:47:17 +出错时间:05/20/2023 14:47:17 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2157 +出错时间:05/22/2023 13:23:54 +出错时间:05/22/2023 13:23:54 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2022 +出错时间:05/22/2023 13:23:54 +出错时间:05/22/2023 13:23:54 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1918 +出错时间:05/22/2023 13:23:54 +出错时间:05/22/2023 13:23:54 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1860 +出错时间:05/22/2023 13:23:54 +出错时间:05/22/2023 13:23:54 + diff --git a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx index 72b097ac..5a497698 100644 --- a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx +++ b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx @@ -22,7 +22,7 @@ - @@ -72,7 +72,7 @@ --%> - + @@ -122,7 +122,7 @@ --%> - + @@ -162,23 +162,17 @@ - - - - - - + - + - + @@ -208,7 +202,7 @@ - + diff --git a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.cs b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.cs index 7743ca4e..f3a20dd9 100644 --- a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.cs @@ -179,8 +179,8 @@ namespace FineUIPro.Web.JDGL.CostAnalysis //按专业统计 DataTable table4 = new DataTable(); table4.Columns.Add(new DataColumn("Id", typeof(String))); - table4.Columns.Add(new DataColumn("Name1", typeof(String))); - table4.Columns.Add(new DataColumn("Name2", typeof(String))); + table4.Columns.Add(new DataColumn("SupId", typeof(String))); + table4.Columns.Add(new DataColumn("Name", typeof(String))); table4.Columns.Add(new DataColumn("mBCWP", typeof(String))); table4.Columns.Add(new DataColumn("mBCWS", typeof(String))); table4.Columns.Add(new DataColumn("mACWP", typeof(String))); @@ -206,6 +206,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis DataRow row4; decimal cnACWP, cnBCWP, cnBCWS, cnmACWP, cnmBCWP, cnmBCWS, cnCV, cnSV, cnCPI, cnSPI, cnmCV, cnmSV, cnmCPI, cnmSPI, unACWP, unBCWP, unBCWS, unmACWP, unmBCWP, unmBCWS, unCV, unSV, unCPI, unSPI, unmCV, unmSV, unmCPI, unmSPI; + int a = 1, b = 1; foreach (var cn in cnProfessionInits) { cnACWP = 0; @@ -223,8 +224,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis cnmCPI = 0; cnmSPI = 0; row4 = table4.NewRow(); - row4[0] = SQLHelper.GetNewID(); - row4[1] = cn.CnProfessionName; + row4[0] = a; + row4[1] = "0"; + row4[2] = cn.CnProfessionName; var cnDetails = (from x in details join y in cnProfessions on x.ParentId equals y.CnProfessionId where y.OldId == cn.CnProfessionId @@ -270,6 +272,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis row4[15] = cnCPI.ToString("0.####"); row4[16] = cnSPI.ToString("0.####"); table4.Rows.Add(row4); + b = 1; var unLists = (from x in unitProjectInits where x.CnProfessionId == cn.CnProfessionId orderby x.SortIndex select x).ToList(); foreach (var un in unLists) { @@ -288,7 +291,8 @@ namespace FineUIPro.Web.JDGL.CostAnalysis unmCPI = 0; unmSPI = 0; row4 = table4.NewRow(); - row4[0] = SQLHelper.GetNewID(); + row4[0] = a.ToString() + "." + b.ToString(); + row4[1] = a; row4[2] = un.UnitProjectName; var unDetails = from x in details join y in unitProjects on x.ParentId equals y.UnitProjectId @@ -335,7 +339,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis row4[15] = unCPI.ToString("0.####"); row4[16] = unSPI.ToString("0.####"); table4.Rows.Add(row4); + b++; } + a++; } this.Grid4.DataSource = table4; this.Grid4.DataBind(); @@ -503,14 +509,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 //builder.CellFormat.Width = 30; //builder.Write("序号"); - //赢得值参数 + //赢得值参数(单位：万元) builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First; builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 240; - builder.Write("赢得值参数"); + builder.Write("赢得值参数(单位：万元)"); //赢得值评价指标 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -662,14 +668,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 //builder.CellFormat.Width = 30; //builder.Write("序号"); - //赢得值参数 + //赢得值参数(单位：万元) builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First; builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 240; - builder.Write("赢得值参数"); + builder.Write("赢得值参数(单位：万元)"); //赢得值评价指标 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -829,14 +835,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 60; builder.Write("分部工程"); - //本月赢得值参数 + //本月赢得值参数(单位：万元) builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First; builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 150; - builder.Write("本月赢得值参数"); + builder.Write("本月赢得值参数(单位：万元)"); //本月赢得值评价指标 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -936,7 +942,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis select x; decimal cnACWP, cnBCWP, cnBCWS, cnmACWP, cnmBCWP, cnmBCWS, cnCV, cnSV, cnCPI, cnSPI, cnmCV, cnmSV, cnmCPI, cnmSPI, unACWP, unBCWP, unBCWS, unmACWP, unmBCWP, unmBCWS, unCV, unSV, unCPI, unSPI, unmCV, unmSV, unmCPI, unmSPI; - int h = 1; + int a = 1, b = 1; foreach (var cn in cnProfessionInits) { cnmACWP = 0; @@ -954,7 +960,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 30; - builder.Write(h.ToString()); + builder.Write(a.ToString()); //专业 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -1045,7 +1051,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.Width = 50; builder.Write(cnmSPI.ToString("0.####")); builder.EndRow(); - h++; + b = 1; var unLists = (from x in unitProjectInits where x.CnProfessionId == cn.CnProfessionId orderby x.SortIndex select x).ToList(); foreach (var un in unLists) { @@ -1064,7 +1070,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 30; - builder.Write(h.ToString()); + builder.Write(a.ToString() + "." + b.ToString()); //专业 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -1155,8 +1161,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.Width = 50; builder.Write(unmSPI.ToString("0.####")); builder.EndRow(); - h++; + b++; } + a++; } @@ -1192,7 +1199,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 60; builder.Write("分部工程"); - //累计赢得值参数 + //累计赢得值参数(单位：万元) builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First; @@ -1200,7 +1207,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.VerticalMerge = CellMerge.None; builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 150; - builder.Write("累计赢得值参数"); + builder.Write("累计赢得值参数(单位：万元)"); //累计赢得值评价指标 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -1292,7 +1299,8 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.Width = 50; builder.Write("SPI"); builder.EndRow(); - h = 1; + a = 1; + b = 1; foreach (var cn in cnProfessionInits) { cnACWP = 0; @@ -1309,7 +1317,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 30; - builder.Write(h.ToString()); + builder.Write(a.ToString()); //专业 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -1413,7 +1421,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.Width = 50; builder.Write(cnSPI.ToString("0.####")); builder.EndRow(); - h++; + b = 1; var unLists = (from x in unitProjectInits where x.CnProfessionId == cn.CnProfessionId orderby x.SortIndex select x).ToList(); foreach (var un in unLists) { @@ -1431,7 +1439,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐 builder.CellFormat.Width = 30; - builder.Write(h.ToString()); + builder.Write(a.ToString() + "." + b.ToString()); //专业 builder.InsertCell(); builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; @@ -1522,8 +1530,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis builder.CellFormat.Width = 50; builder.Write(unSPI.ToString("0.####")); builder.EndRow(); - h++; + b++; } + a++; } #endregion doc.Save(newUrl); diff --git a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.designer.cs index 370afd0e..8591a6ef 100644 --- a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.designer.cs @@ -192,15 +192,6 @@ namespace FineUIPro.Web.JDGL.CostAnalysis { /// protected global::FineUIPro.Grid Grid4; - /// - /// lblPageIndex 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label lblPageIndex; - /// /// GroupPanel5 控件。 ///