diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-18-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-18-bwj.sql new file mode 100644 index 00000000..af75d37e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-03-18-bwj.sql @@ -0,0 +1,257 @@ + +delete from Sys_Menu where MenuId='E4DD3689-0A72-43A5-8058-34C14D1FA4B0' +delete from Sys_ButtonToMenu where MenuId='E4DD3689-0A72-43A5-8058-34C14D1FA4B0' +go + + +CREATE TABLE [dbo].[TestRun_MonthReport]( + [MonthReportId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [MonthReportCode] [nvarchar](50) NULL, + [MonthReportDate] [datetime] NULL, + [ProjectOverview] [nvarchar](1000) NULL, + [ProjectBaseInfo] [nvarchar](2000) NULL, + [EngineeringPlant] [nvarchar](2000) NULL, + [ProjectContract] [nvarchar](2000) NULL, + [Milestone] [nvarchar](1000) NULL, + [CompleteWork] [nvarchar](1000) NULL, + [ProblemSituation] [nvarchar](1000) NULL, + [Budget] [decimal](18, 2) NULL, + [BudgetTotal] [decimal](18, 2) NULL, + [ActualCost] [decimal](18, 2) NULL, + [ActualCostTotal] [decimal](18, 2) NULL, + [PublicationStatus] [nvarchar](500) NULL, + [ImplementationStatus] [nvarchar](500) NULL, + [HSEManageSituation] [nvarchar](500) NULL, + [NextMonthMilestone] [nvarchar](1000) NULL, + [NextMonthCompleteWork] [nvarchar](1000) NULL, + [NextMonthSchedule] [nvarchar](1000) NULL, + [NextMonthDrivingCost] [nvarchar](1000) NULL, + [ProblemsMeasures] [nvarchar](2000) NULL, + [SolvedProblems] [nvarchar](2000) NULL, + [PushPerson] [nvarchar](1000) NULL, + CONSTRAINT [PK_TestRun_MonthReport] PRIMARY KEY CLUSTERED +( + [MonthReportId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[TestRun_MonthReport] WITH CHECK ADD CONSTRAINT [FK_TestRun_MonthReport_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[TestRun_MonthReport] CHECK CONSTRAINT [FK_TestRun_MonthReport_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'±' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @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'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'MonthReportCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'MonthReportDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿơĿơûơĿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProjectOverview' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProjectBaseInfo' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'װ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'EngineeringPlant' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProjectContract' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¿ﵽҪƵ̱' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'Milestone' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɵĿҪ/' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'CompleteWork' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'´ĽԼչ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProblemSituation' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¿Ԥֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'Budget' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۼƿԤֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'BudgetTotal' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¿ʵֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ActualCost' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۼƿʵֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ActualCostTotal' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¿ڲⲿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'PublicationStatus' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¿ڲⲿʵʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ImplementationStatus' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'HSE' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'HSEManageSituation' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¿ӦﵽҪƵ̱' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthMilestone' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӦɵĿҪ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthCompleteWork' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'µĻ׼ȼƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthSchedule' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ҫÿƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthDrivingCost' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿǰڵҪ⼰Ľʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProblemsMeasures' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҪĿĿܡزԼû' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'SolvedProblems' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'PushPerson' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'±' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport' +GO + +CREATE TABLE [dbo].[TestRun_MonthReportItem]( + [MonthReportItemId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [SortIndex] [nchar](10) NULL, + [WorkPackageType] [nvarchar](50) NULL, + [Unit] [nchar](10) NULL, + [DesignCount] [int] NULL, + [MonthPlan] [int] NULL, + [MonthActual] [nvarchar](50) NULL, + [TotalPlan] [int] NULL, + [TatalActual] [int] NULL, + [CompletionRate] [nvarchar](50) NULL, + CONSTRAINT [PK_TestRun_MonthReportItem] PRIMARY KEY CLUSTERED +( + [MonthReportItemId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[TestRun_MonthReportItem] WITH CHECK ADD CONSTRAINT [FK_TestRun_MonthReportItem_TestRun_MonthReport] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[TestRun_MonthReport] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[TestRun_MonthReportItem] CHECK CONSTRAINT [FK_TestRun_MonthReportItem_TestRun_MonthReport] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthReportItemId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'±Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'SortIndex' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'WorkPackageType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'Unit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'DesignCount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¼ƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthPlan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthActual' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۼƼƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'TotalPlan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۼʵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'TatalActual' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'CompletionRate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͳƱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem' +GO + + + + +CREATE TABLE [dbo].[TestRun_MonthReportItem2]( + [MonthReportItem2Id] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [ReportType] [nvarchar](50) NULL, + [TypeName] [nvarchar](50) NULL, + [PV] [nvarchar](50) NULL, + [EV] [nvarchar](50) NULL, + [AC] [nvarchar](50) NULL, + [CV] [nvarchar](50) NULL, + [SV] [nvarchar](50) NULL, + [CPI] [nvarchar](50) NULL, + [SPI] [nvarchar](50) NULL, + [SortIndex] [int] NULL, + CONSTRAINT [PK_MonthReportItem2] PRIMARY KEY CLUSTERED +( + [MonthReportItem2Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[TestRun_MonthReportItem2] WITH CHECK ADD CONSTRAINT [FK_TestRun_MonthReportItem2_TestRun_MonthReport] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[TestRun_MonthReport] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[TestRun_MonthReportItem2] CHECK CONSTRAINT [FK_TestRun_MonthReportItem2_TestRun_MonthReport] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'MonthReportItem2Id' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'±id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ1-£2-ۼƣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'ReportType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'TypeName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ƻֵPVҲΪƻԤɱBCWS' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'PV' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӮֵEV(ҲΪֵɹԤɱBCWP)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'EV' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵʳɱAC(ҲΪɹʵʳɱACWP)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'AC' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɱƫ(CV=EV-AC)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'CV' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ƫSV (SV=EV-PV)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'SV' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɱЧָCPI (CPI=EV/AC)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'CPI' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȼЧָ SPI (SPI = EV/PV)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'SPI' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Чݱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2' +GO + + + + + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 913c7dd6..75575442 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -753,6 +753,9 @@ + + + diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItem2Service.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItem2Service.cs new file mode 100644 index 00000000..2fef4e56 --- /dev/null +++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItem2Service.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 开车绩效测量数据 + /// + public class TestRun_MonthReportItem2Service + { + /// + /// 根据月报告id获取开车绩效测量数据 + /// + /// + /// + public static List GetMonthReportItem2ByReportId(string monthReportId, string reportType) + { + return (from x in Funs.DB.TestRun_MonthReportItem2 where x.MonthReportId == monthReportId && x.ReportType == reportType orderby x.SortIndex select x).ToList(); + } + + /// + /// 添加开车绩效测量数据 + /// + /// + public static void AddMonthReportItem2(Model.TestRun_MonthReportItem2 item) + { + Model.TestRun_MonthReportItem2 newItem = new Model.TestRun_MonthReportItem2 + { + MonthReportItem2Id = item.MonthReportItem2Id, + MonthReportId = item.MonthReportId, + ReportType = item.ReportType, + TypeName = item.TypeName, + PV = item.PV, + EV = item.EV, + AC = item.AC, + CV = item.CV, + SV = item.SV, + CPI = item.CPI, + SPI = item.SPI, + SortIndex=item.SortIndex, + }; + Funs.DB.TestRun_MonthReportItem2.InsertOnSubmit(newItem); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据月报告id删除开车绩效测量数据 + /// + /// + public static void DeleteMonthReportItem2ByReportId(string reportId) + { + var q = (from x in Funs.DB.TestRun_MonthReportItem2 where x.MonthReportId == reportId select x).ToList(); + if (q.Count > 0) + { + Funs.DB.TestRun_MonthReportItem2.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItemService.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItemService.cs new file mode 100644 index 00000000..a1ecfc78 --- /dev/null +++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItemService.cs @@ -0,0 +1,59 @@ +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 工作包完成情况统计 + /// + public class TestRun_MonthReportItemService + { + /// + /// 根据月报id获取工作包完成情况 + /// + /// + /// + public static List GetMonthReportItemByReportId(string monthReportId) + { + return (from x in Funs.DB.TestRun_MonthReportItem where x.MonthReportId == monthReportId orderby x.SortIndex select x).ToList(); + } + + /// + /// 添加工作包完成情况 + /// + /// + public static void AddMonthReportItem(Model.TestRun_MonthReportItem item) + { + Model.TestRun_MonthReportItem newItem = new Model.TestRun_MonthReportItem + { + MonthReportItemId = item.MonthReportItemId, + MonthReportId = item.MonthReportId, + SortIndex = item.SortIndex, + WorkPackageType = item.WorkPackageType, + Unit = item.Unit, + DesignCount = item.DesignCount, + MonthPlan = item.MonthPlan, + MonthActual = item.MonthActual, + TotalPlan = item.TotalPlan, + TatalActual = item.TatalActual, + CompletionRate = item.CompletionRate + }; + Funs.DB.TestRun_MonthReportItem.InsertOnSubmit(newItem); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据月报告id删除工作包完成情况 + /// + /// + public static void DeleteMonthReportItemByMonthReportId(string monthReportId) + { + var q = (from x in Funs.DB.TestRun_MonthReportItem where x.MonthReportId == monthReportId select x).ToList(); + if (q.Count > 0) + { + Funs.DB.TestRun_MonthReportItem.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs new file mode 100644 index 00000000..d4a6386f --- /dev/null +++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs @@ -0,0 +1,117 @@ +using System; +using System.Linq; + +namespace BLL +{ + /// + /// 开车月报告 + /// + public class TestRun_MonthReportService + { + /// + /// 根据主键获取开车月报告 + /// + /// + /// + public static Model.TestRun_MonthReport GetMonthReportById(string monthReportId) + { + return Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId); + } + + /// + /// 根据月份获取开车月报告 + /// + /// + /// + public static Model.TestRun_MonthReport GetMonthReportByMonth(string month) + { + return Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportDate == Convert.ToDateTime(month)); + } + + /// + /// 添加开车月报告 + /// + /// + public static void AddMonthReport(Model.TestRun_MonthReport monthReport) + { + Model.TestRun_MonthReport newMonthReport = new Model.TestRun_MonthReport + { + MonthReportId = monthReport.MonthReportId, + ProjectId = monthReport.ProjectId, + MonthReportCode = monthReport.MonthReportCode, + MonthReportDate = monthReport.MonthReportDate, + ProjectOverview = monthReport.ProjectOverview, + ProjectBaseInfo = monthReport.ProjectBaseInfo, + EngineeringPlant = monthReport.EngineeringPlant, + ProjectContract = monthReport.ProjectContract, + Milestone = monthReport.Milestone, + CompleteWork = monthReport.CompleteWork, + ProblemSituation = monthReport.ProblemSituation, + Budget = monthReport.Budget, + BudgetTotal = monthReport.BudgetTotal, + ActualCost = monthReport.ActualCost, + ActualCostTotal = monthReport.ActualCostTotal, + PublicationStatus = monthReport.PublicationStatus, + ImplementationStatus = monthReport.ImplementationStatus, + HSEManageSituation = monthReport.HSEManageSituation, + NextMonthMilestone = monthReport.NextMonthMilestone, + NextMonthCompleteWork = monthReport.NextMonthCompleteWork, + NextMonthSchedule = monthReport.NextMonthSchedule, + NextMonthDrivingCost = monthReport.NextMonthDrivingCost, + ProblemsMeasures = monthReport.ProblemsMeasures, + SolvedProblems = monthReport.SolvedProblems, + }; + Funs.DB.TestRun_MonthReport.InsertOnSubmit(newMonthReport); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改开车月报告 + /// + /// + public static void UpdateMonthReport(Model.TestRun_MonthReport monthReport) + { + Model.TestRun_MonthReport newMonthReport = Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReport.MonthReportId); + if (newMonthReport != null) + { + newMonthReport.MonthReportCode = monthReport.MonthReportCode; + newMonthReport.MonthReportDate = monthReport.MonthReportDate; + newMonthReport.ProjectOverview = monthReport.ProjectOverview; + newMonthReport.ProjectBaseInfo = monthReport.ProjectBaseInfo; + newMonthReport.EngineeringPlant = monthReport.EngineeringPlant; + newMonthReport.ProjectContract = monthReport.ProjectContract; + newMonthReport.Milestone = monthReport.Milestone; + newMonthReport.CompleteWork = monthReport.CompleteWork; + newMonthReport.ProblemSituation = monthReport.ProblemSituation; + newMonthReport.Budget = monthReport.Budget; + newMonthReport.BudgetTotal = monthReport.BudgetTotal; + newMonthReport.ActualCost = monthReport.ActualCost; + newMonthReport.ActualCostTotal = monthReport.ActualCostTotal; + newMonthReport.PublicationStatus = monthReport.PublicationStatus; + newMonthReport.ImplementationStatus = monthReport.ImplementationStatus; + newMonthReport.HSEManageSituation = monthReport.HSEManageSituation; + newMonthReport.NextMonthMilestone = monthReport.NextMonthMilestone; + newMonthReport.NextMonthCompleteWork = monthReport.NextMonthCompleteWork; + newMonthReport.NextMonthSchedule = monthReport.NextMonthSchedule; + newMonthReport.NextMonthDrivingCost = monthReport.NextMonthDrivingCost; + newMonthReport.ProblemsMeasures = monthReport.ProblemsMeasures; + newMonthReport.SolvedProblems = monthReport.SolvedProblems; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据主键删除开车月报告 + /// + /// + public static void DeleteMonthReportById(string monthReportId) + { + Model.TestRun_MonthReport newMonthReport = Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId); + if (newMonthReport != null) + { + Funs.DB.TestRun_MonthReport.DeleteOnSubmit(newMonthReport); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b9a971a9..0100c1b3 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1761,6 +1761,9 @@ + + + @@ -15905,6 +15908,27 @@ MonthReportEdit.aspx + + MonthReportPush.aspx + ASPXCodeBehind + + + MonthReportPush.aspx + + + MonthReportPushView.aspx + ASPXCodeBehind + + + MonthReportPushView.aspx + + + MonthReportView.aspx + ASPXCodeBehind + + + MonthReportView.aspx + PropertyReport.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx index dcae9ce4..6a74db1b 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx @@ -20,7 +20,7 @@ - + <%----%> @@ -38,24 +38,24 @@ - + --%> + - - + FieldType="Date" Renderer="Date" HeaderText="编制日期" HeaderTextAlign="Center" Width="110px"> - - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs index 3969424c..48ade239 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs @@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport GetButtonPower(); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("DriverRunCompleteEdit.aspx") + "return false;"; - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); } } #endregion @@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport + @" WHERE report.ProjectId=@projectId AND report.ReportType='6'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - strSql += " AND report.UnitWorkId=@unitWorkId"; - listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); - } + //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND report.UnitWorkId=@unitWorkId"; + // listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); + //} if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim())) { strSql += " AND report.DriverReporName LIKE @DriverReporName"; diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs index 94e5f912..0a88ffa2 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs @@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Toolbar ToolSearch; - /// - /// drpUnitWorkId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpUnitWorkId; - /// /// txtDriverReporName 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx index d1e2fa6f..d0ba34b9 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx @@ -34,20 +34,20 @@ - + <%-- - + --%> - + - + @@ -59,15 +59,15 @@ - + - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs index bb010c35..4ec5d6eb 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport { if (!IsPostBack) { - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) @@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport if (data != null) { this.hdId.Text = id; - if (!string.IsNullOrEmpty(data.UnitWorkId)) - { - this.drpUnitWorkId.SelectedValue = data.UnitWorkId; - } + //if (!string.IsNullOrEmpty(data.UnitWorkId)) + //{ + // this.drpUnitWorkId.SelectedValue = data.UnitWorkId; + //} this.txtDriverReportCode.Text = data.DriverReportCode; this.txtDriverReporName.Text = data.DriverReporName; this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson); this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; - this.txtNumber.Text = data.Number; + //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; } } @@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { string id = Request.Params["id"]; Model.Driver_DriverReport newData = new Model.Driver_DriverReport(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } + //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; + //} newData.DriverReportCode = this.txtDriverReportCode.Text.Trim(); newData.DriverReporName = this.txtDriverReporName.Text.Trim(); newData.CompilePerson = this.CurrUser.UserId; newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim()); - newData.Number = this.txtNumber.Text.Trim(); + //newData.Number = this.txtNumber.Text.Trim(); newData.Remark = this.txtRemark.Text.Trim(); newData.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(id)) diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs index 95b6a167..e296de19 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs @@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Form Form2; /// - /// drpUnitWorkId 控件。 + /// txtDriverReportCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.TextBox txtDriverReportCode; /// /// txtDriverReporName 控件。 @@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.TextBox txtDriverReporName; - /// - /// txtDriverReportCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDriverReportCode; - /// /// txtCompilePerson 控件。 /// @@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.DatePicker txtSubmitDate; - /// - /// txtNumber 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtNumber; - /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx index e8dd7197..e6e45728 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx @@ -20,7 +20,7 @@ - + <%----%> @@ -38,24 +38,24 @@ - + --%> + - - + FieldType="Date" Renderer="Date" HeaderText="编制时间" HeaderTextAlign="Center" Width="110px"> - - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs index dc54e1e8..e35bc09e 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs @@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport GetButtonPower(); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("FeedTestRunReportEdit.aspx") + "return false;"; - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); } } #endregion @@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport + @" WHERE report.ProjectId=@projectId AND report.ReportType='4'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - strSql += " AND report.UnitWorkId=@unitWorkId"; - listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); - } + //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND report.UnitWorkId=@unitWorkId"; + // listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); + //} if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim())) { strSql += " AND report.DriverReporName LIKE @DriverReporName"; diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs index 8370f4e7..e34356d3 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs @@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Toolbar ToolSearch; - /// - /// drpUnitWorkId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpUnitWorkId; - /// /// txtDriverReporName 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx index 828e7c5f..cd4c1143 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx @@ -34,20 +34,20 @@ - + <%-- - + --%> - + - + @@ -59,15 +59,15 @@ - + - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs index 32f094b0..7b21d546 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport { if (!IsPostBack) { - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) @@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport if (data != null) { this.hdId.Text = id; - if (!string.IsNullOrEmpty(data.UnitWorkId)) - { - this.drpUnitWorkId.SelectedValue = data.UnitWorkId; - } + //if (!string.IsNullOrEmpty(data.UnitWorkId)) + //{ + // this.drpUnitWorkId.SelectedValue = data.UnitWorkId; + //} this.txtDriverReportCode.Text = data.DriverReportCode; this.txtDriverReporName.Text = data.DriverReporName; this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson); this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; - this.txtNumber.Text = data.Number; + //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; } } @@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { string id = Request.Params["id"]; Model.Driver_DriverReport newData = new Model.Driver_DriverReport(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } + //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; + //} newData.DriverReportCode = this.txtDriverReportCode.Text.Trim(); newData.DriverReporName = this.txtDriverReporName.Text.Trim(); newData.CompilePerson = this.CurrUser.UserId; newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim()); - newData.Number = this.txtNumber.Text.Trim(); + //newData.Number = this.txtNumber.Text.Trim(); newData.Remark = this.txtRemark.Text.Trim(); newData.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(id)) diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs index d1d97836..634ab547 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs @@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Form Form2; /// - /// drpUnitWorkId 控件。 + /// txtDriverReportCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.TextBox txtDriverReportCode; /// /// txtDriverReporName 控件。 @@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.TextBox txtDriverReporName; - /// - /// txtDriverReportCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDriverReportCode; - /// /// txtCompilePerson 控件。 /// @@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.DatePicker txtSubmitDate; - /// - /// txtNumber 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtNumber; - /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx index 706a75ce..a918884d 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx @@ -20,7 +20,7 @@ - + <%----%> @@ -38,24 +38,24 @@ - + --%> + - - + FieldType="Date" Renderer="Date" HeaderText="编制日期" HeaderTextAlign="Center" Width="110px"> - - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs index 23f4debb..367bc904 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs @@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport GetButtonPower(); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("LinkedTestRunReportEdit.aspx") + "return false;"; - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); } } #endregion @@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport + @" WHERE report.ProjectId=@projectId AND report.ReportType='3'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - strSql += " AND report.UnitWorkId=@unitWorkId"; - listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); - } + //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND report.UnitWorkId=@unitWorkId"; + // listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); + //} if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim())) { strSql += " AND report.DriverReporName LIKE @DriverReporName"; diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs index 3069c926..9b5513f2 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs @@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Toolbar ToolSearch; - /// - /// drpUnitWorkId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpUnitWorkId; - /// /// txtDriverReporName 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx index 4d2d9006..6a835253 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx @@ -34,20 +34,20 @@ - + <%-- - + --%> - + - + @@ -59,15 +59,15 @@ - + - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs index 6b84a5ff..c915e665 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport { if (!IsPostBack) { - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) @@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport if (data != null) { this.hdId.Text = id; - if (!string.IsNullOrEmpty(data.UnitWorkId)) - { - this.drpUnitWorkId.SelectedValue = data.UnitWorkId; - } + //if (!string.IsNullOrEmpty(data.UnitWorkId)) + //{ + // this.drpUnitWorkId.SelectedValue = data.UnitWorkId; + //} this.txtDriverReportCode.Text = data.DriverReportCode; this.txtDriverReporName.Text = data.DriverReporName; this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson); this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; - this.txtNumber.Text = data.Number; + //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; } } @@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { string id = Request.Params["id"]; Model.Driver_DriverReport newData = new Model.Driver_DriverReport(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } + //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; + //} newData.DriverReportCode = this.txtDriverReportCode.Text.Trim(); newData.DriverReporName = this.txtDriverReporName.Text.Trim(); newData.CompilePerson = this.CurrUser.UserId; newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim()); - newData.Number = this.txtNumber.Text.Trim(); + //newData.Number = this.txtNumber.Text.Trim(); newData.Remark = this.txtRemark.Text.Trim(); newData.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(id)) diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs index a6cee6b5..ad70ab29 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs @@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Form Form2; /// - /// drpUnitWorkId 控件。 + /// txtDriverReportCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.TextBox txtDriverReportCode; /// /// txtDriverReporName 控件。 @@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.TextBox txtDriverReporName; - /// - /// txtDriverReportCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDriverReportCode; - /// /// txtCompilePerson 控件。 /// @@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.DatePicker txtSubmitDate; - /// - /// txtNumber 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtNumber; - /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx index c87fb073..c7c3cad1 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx @@ -14,14 +14,13 @@ ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch"> - - + @@ -38,27 +37,16 @@ - - - - - - - - - - - - - + + + + + @@ -83,7 +71,11 @@ + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs index 715b2e8e..384ce137 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs @@ -17,7 +17,6 @@ namespace FineUIPro.Web.TestRun.DriverReport GetButtonPower(); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("MonthReportEdit.aspx") + "return false;"; - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); } } #endregion @@ -26,38 +25,23 @@ namespace FineUIPro.Web.TestRun.DriverReport //加载列表 public void BindGrid() { - string strSql = @"SELECT report.DriverReportId, - report.DriverReportCode, - report.DriverReporName, + string strSql = @"SELECT report.MonthReportId, report.ProjectId, - report.UnitWorkId, - report.CompilePerson, - report.SubmitDate, - report.Number, - report.ReportType, - report.Remark, - unitWork.UnitWorkName, - u.UserName AS CompilePersonName" - + @" FROM Driver_DriverReport AS report " - + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId" - + @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson" - + @" WHERE report.ProjectId=@projectId AND report.ReportType='2'"; + report.MonthReportCode, + (CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate" + + @" FROM TestRun_MonthReport AS report " + + @" WHERE report.ProjectId=@projectId "; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + + if (!string.IsNullOrEmpty(this.txtMonthReportCode.Text.Trim())) { - strSql += " AND report.UnitWorkId=@unitWorkId"; - listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); - } - if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim())) - { - strSql += " AND report.DriverReporName LIKE @DriverReporName"; - listStr.Add(new SqlParameter("@DriverReporName", "%" + this.txtDriverReporName.Text.Trim() + "%")); + strSql += " AND report.MonthReportCode LIKE @monthReportCode"; + listStr.Add(new SqlParameter("@monthReportCode", "%" + this.txtMonthReportCode.Text.Trim() + "%")); } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; Grid1.DataBind(); @@ -157,10 +141,12 @@ namespace FineUIPro.Web.TestRun.DriverReport foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - var info = BLL.DriverReportService.GetDriverReportById(rowID); + var info = BLL.TestRun_MonthReportService.GetMonthReportById(rowID); if (info != null) { - BLL.DriverReportService.DeleteDriverReport(rowID); + BLL.TestRun_MonthReportItem2Service.DeleteMonthReportItem2ByReportId(rowID); + BLL.TestRun_MonthReportItemService.DeleteMonthReportItemByMonthReportId(rowID); + BLL.TestRun_MonthReportService.DeleteMonthReportById(rowID); } } BindGrid(); @@ -182,6 +168,34 @@ namespace FineUIPro.Web.TestRun.DriverReport { PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", id, BLL.Const.MonthReportMenuId))); } + else if (e.CommandName == "Push")//推送提醒 + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("MonthReportPush.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + } + else if (e.CommandName == "SeePush")//查看推送内容 + { + var report = BLL.TestRun_MonthReportService.GetMonthReportById(id); + if (report != null) + { + if (!string.IsNullOrEmpty(report.PushPerson)) + { + if (report.PushPerson.Contains(this.CurrUser.UserId)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportPushView.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + } + else + { + Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！"); + return; + } + } + else + { + Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！"); + return; + } + } + } } #endregion @@ -210,5 +224,22 @@ namespace FineUIPro.Web.TestRun.DriverReport } } #endregion + + #region 查看 + /// + /// 查看 + /// + /// + /// + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportView.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs index d7655cb2..edfc0c9e 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs @@ -58,22 +58,13 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Toolbar ToolSearch; /// - /// drpUnitWorkId 控件。 + /// txtMonthReportCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; - - /// - /// txtDriverReporName 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDriverReporName; + protected global::FineUIPro.TextBox txtMonthReportCode; /// /// btnSearch 控件。 @@ -138,6 +129,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Window Window1; + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + /// /// WindowAtt 控件。 /// @@ -173,5 +173,14 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuDel; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; } } diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx index 9f05a373..96d4ec73 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx @@ -4,8 +4,8 @@ - - + + 编辑开车月报告
@@ -36,42 +36,577 @@ - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs index bcc18fd2..269f3232 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs @@ -1,11 +1,25 @@ using BLL; +using Newtonsoft.Json.Linq; using System; +using System.Collections.Generic; namespace FineUIPro.Web.TestRun.DriverReport { public partial class MonthReportEdit : PageBase { - #region 加载 + #region 定义集合 + /// + /// 工作包完成情况统计 + /// + public static List monthReportItems = new List(); + + /// + /// 开车绩效测量数据 + /// + public static List monthReportItems2 = new List(); + #endregion + + #region 页面加载 /// /// 页面加载 /// @@ -15,32 +29,96 @@ namespace FineUIPro.Web.TestRun.DriverReport { if (!IsPostBack) { - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); - string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) { - Model.Driver_DriverReport data = BLL.DriverReportService.GetDriverReportById(id); + Model.TestRun_MonthReport data = BLL.TestRun_MonthReportService.GetMonthReportById(id); if (data != null) { this.hdId.Text = id; - if (!string.IsNullOrEmpty(data.UnitWorkId)) - { - this.drpUnitWorkId.SelectedValue = data.UnitWorkId; - } - this.txtDriverReportCode.Text = data.DriverReportCode; - this.txtDriverReporName.Text = data.DriverReporName; - this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson); - this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; - this.txtNumber.Text = data.Number; - this.txtRemark.Text = data.Remark; + this.txtMonthReportCode.Text = data.MonthReportCode; + this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : ""; + this.txtProjectOverview.Text = data.ProjectOverview; + this.txtProjectBaseInfo.Text = data.ProjectBaseInfo; + this.txtEngineeringPlant.Text = data.EngineeringPlant; + this.txtProjectContract.Text = data.ProjectContract; + this.txtMilestone.Text = data.Milestone; + this.txtCompleteWork.Text = data.CompleteWork; + this.txtProblemSituation.Text = data.ProblemSituation; + this.txtBudget.Text = data.Budget.HasValue ? data.Budget.ToString() : ""; + this.txtBudgetTotal.Text = data.BudgetTotal.HasValue ? data.BudgetTotal.ToString() : ""; + this.txtActualCost.Text = data.ActualCost.HasValue ? data.ActualCost.ToString() : ""; + this.txtActualCostTotal.Text = data.ActualCostTotal.HasValue ? data.ActualCostTotal.ToString() : ""; + this.txtPublicationStatus.Text = data.PublicationStatus; + this.txtImplementationStatus.Text = data.ImplementationStatus; + this.txtHSEManageSituation.Text = data.HSEManageSituation; + this.txtNextMonthMilestone.Text = data.NextMonthMilestone; + this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork; + this.txtNextMonthSchedule.Text = data.NextMonthSchedule; + this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost; + this.txtProblemsMeasures.Text = data.ProblemsMeasures; + this.txtSolvedProblems.Text = data.SolvedProblems; + } + + var items = BLL.TestRun_MonthReportItemService.GetMonthReportItemByReportId(this.hdId.Text); + if (items.Count > 0) + { + this.Grid1.DataSource = items; + this.Grid1.DataBind(); + } + + var items2 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "1"); + if (items2.Count > 0) + { + this.Grid2.DataSource = items2; + this.Grid2.DataBind(); + } + + var items3 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "2"); + if (items3.Count > 0) + { + this.Grid3.DataSource = items3; + this.Grid3.DataBind(); } } else { - this.txtCompilePerson.Text = this.CurrUser.UserName; - this.txtSubmitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtMonthReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + + #region 开车绩效测量数据 + Model.TestRun_MonthReportItem2 newItem = new Model.TestRun_MonthReportItem2(); + newItem.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)); + newItem.TypeName = "设计"; + monthReportItems2.Add(newItem); + + Model.TestRun_MonthReportItem2 newItem2 = new Model.TestRun_MonthReportItem2(); + newItem2.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)); + newItem2.TypeName = "采购"; + monthReportItems2.Add(newItem2); + + Model.TestRun_MonthReportItem2 newItem3 = new Model.TestRun_MonthReportItem2(); + newItem3.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)); + newItem3.TypeName = "施工"; + monthReportItems2.Add(newItem3); + + Model.TestRun_MonthReportItem2 newItem4 = new Model.TestRun_MonthReportItem2(); + newItem4.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)); + newItem4.TypeName = "开车"; + monthReportItems2.Add(newItem4); + + Model.TestRun_MonthReportItem2 newItem5 = new Model.TestRun_MonthReportItem2(); + newItem5.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)); + newItem5.TypeName = "项目"; + monthReportItems2.Add(newItem5); + + this.Grid2.DataSource = monthReportItems2; + this.Grid2.DataBind(); + + this.Grid3.DataSource = monthReportItems2; + this.Grid3.DataBind(); + #endregion } + GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)"; } } #endregion @@ -55,7 +133,7 @@ namespace FineUIPro.Web.TestRun.DriverReport { if (string.IsNullOrEmpty(this.hdId.Text)) //新增记录 { - this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_DriverReport)); + this.hdId.Text = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReport)); } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", this.hdId.Text, BLL.Const.MonthReportMenuId))); } @@ -70,40 +148,200 @@ namespace FineUIPro.Web.TestRun.DriverReport protected void btnSave_Click(object sender, EventArgs e) { string id = Request.Params["id"]; - Model.Driver_DriverReport newData = new Model.Driver_DriverReport(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } - newData.DriverReportCode = this.txtDriverReportCode.Text.Trim(); - newData.DriverReporName = this.txtDriverReporName.Text.Trim(); - newData.CompilePerson = this.CurrUser.UserId; - newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim()); - newData.Number = this.txtNumber.Text.Trim(); - newData.Remark = this.txtRemark.Text.Trim(); + Model.TestRun_MonthReport newData = new Model.TestRun_MonthReport(); + newData.MonthReportCode = this.txtMonthReportCode.Text.Trim(); + newData.MonthReportDate = Funs.GetNewDateTime(this.txtMonthReportDate.Text.Trim()); newData.ProjectId = this.CurrUser.LoginProjectId; + newData.ProjectOverview = this.txtProjectOverview.Text.Trim(); + newData.ProjectBaseInfo = this.txtProjectBaseInfo.Text.Trim(); + newData.EngineeringPlant = this.txtEngineeringPlant.Text.Trim(); + newData.ProjectContract = this.txtProjectContract.Text.Trim(); + newData.Milestone = this.txtMilestone.Text.Trim(); + newData.CompleteWork = this.txtCompleteWork.Text.Trim(); + newData.ProblemSituation = this.txtProblemSituation.Text.Trim(); + newData.Budget = Funs.GetNewDecimal(this.txtBudget.Text.Trim()); + newData.BudgetTotal = Funs.GetNewDecimal(this.txtBudgetTotal.Text.Trim()); + newData.ActualCost = Funs.GetNewDecimal(this.txtActualCost.Text.Trim()); + newData.ActualCostTotal = Funs.GetNewDecimal(this.txtActualCostTotal.Text.Trim()); + newData.PublicationStatus = this.txtPublicationStatus.Text.Trim(); + newData.ImplementationStatus = this.txtImplementationStatus.Text.Trim(); + newData.HSEManageSituation = this.txtHSEManageSituation.Text.Trim(); + newData.NextMonthMilestone = this.txtNextMonthMilestone.Text.Trim(); + newData.NextMonthCompleteWork = this.txtNextMonthCompleteWork.Text.Trim(); + newData.NextMonthSchedule = this.txtNextMonthSchedule.Text.Trim(); + newData.NextMonthDrivingCost = this.txtNextMonthDrivingCost.Text.Trim(); + newData.ProblemsMeasures = this.txtProblemsMeasures.Text.Trim(); + newData.SolvedProblems = this.txtSolvedProblems.Text.Trim(); + if (!string.IsNullOrEmpty(id)) { - newData.DriverReportId = id; - BLL.DriverReportService.UpdateDriverReport(newData); + newData.MonthReportId = id; + BLL.TestRun_MonthReportService.UpdateMonthReport(newData); } else { - newData.ReportType = "2"; if (!string.IsNullOrEmpty(this.hdId.Text)) { - newData.DriverReportId = this.hdId.Text.Trim(); + newData.MonthReportId = this.hdId.Text.Trim(); } else { - newData.DriverReportId = SQLHelper.GetNewID(typeof(Model.Driver_DriverReport)); - this.hdId.Text = newData.DriverReportId; + newData.MonthReportId = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReport)); + this.hdId.Text = newData.MonthReportId; } - BLL.DriverReportService.AddDriverReport(newData); + BLL.TestRun_MonthReportService.AddMonthReport(newData); } + #region 工作包完成情况统计 + BLL.TestRun_MonthReportItemService.DeleteMonthReportItemByMonthReportId(this.hdId.Text); + jerqueSaveList(); + foreach (var item in monthReportItems) + { + item.MonthReportId = this.hdId.Text; + BLL.TestRun_MonthReportItemService.AddMonthReportItem(item); + } + #endregion + #region 开车绩效测量数据 + BLL.TestRun_MonthReportItem2Service.DeleteMonthReportItem2ByReportId(this.hdId.Text); + jerqueSaveList2(); + foreach (var item in monthReportItems2) + { + item.MonthReportId = this.hdId.Text; + BLL.TestRun_MonthReportItem2Service.AddMonthReportItem2(item); + } + #endregion ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } + + /// + /// 保存工作包完成情况统计 + /// + private void jerqueSaveList() + { + monthReportItems.Clear(); + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.TestRun_MonthReportItem item = new Model.TestRun_MonthReportItem + { + MonthReportItemId = this.Grid1.Rows[i].DataKeys[0].ToString(), + SortIndex = values.Value("SortIndex").ToString(), + WorkPackageType = values.Value("WorkPackageType").ToString(), + Unit = values.Value("Unit").ToString(), + DesignCount = Funs.GetNewInt(values.Value("DesignCount").ToString()), + MonthPlan = Funs.GetNewInt(values.Value("MonthPlan").ToString()), + MonthActual = values.Value("MonthActual").ToString(), + TotalPlan = Funs.GetNewInt(values.Value("TotalPlan").ToString()), + TatalActual = Funs.GetNewInt(values.Value("TatalActual").ToString()), + CompletionRate = values.Value("CompletionRate").ToString(), + }; + monthReportItems.Add(item); + } + } + + /// + /// 保存开车绩效测量数据 + /// + private void jerqueSaveList2() + { + monthReportItems2.Clear(); + int index = 1; + JArray mergedData = Grid2.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + + Model.TestRun_MonthReportItem2 item = new Model.TestRun_MonthReportItem2 + { + MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)), + ReportType = "1", + TypeName = values.Value("TypeName").ToString(), + PV = values.Value("PV").ToString(), + EV = values.Value("EV").ToString(), + AC = values.Value("AC").ToString(), + CV = values.Value("CV").ToString(), + SV = values.Value("SV").ToString(), + CPI = values.Value("CPI").ToString(), + SPI = values.Value("SPI").ToString(), + SortIndex = index++, + }; + monthReportItems2.Add(item); + } + int index2 = 1; + JArray mergedData2 = Grid3.GetMergedData(); + foreach (JObject mergedRow in mergedData2) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.TestRun_MonthReportItem2 item = new Model.TestRun_MonthReportItem2 + { + MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)), + ReportType = "2", + TypeName = values.Value("TypeName").ToString(), + PV = values.Value("PV").ToString(), + EV = values.Value("EV").ToString(), + AC = values.Value("AC").ToString(), + CV = values.Value("CV").ToString(), + SV = values.Value("SV").ToString(), + CPI = values.Value("CPI").ToString(), + SPI = values.Value("SPI").ToString(), + SortIndex = index2++, + }; + monthReportItems2.Add(item); + } + } + #endregion + + #region 增行按钮 + /// + /// 新增 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + jerqueSaveList(); + Model.TestRun_MonthReportItem newItem = new Model.TestRun_MonthReportItem + { + MonthReportItemId = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem)) + }; + monthReportItems.Add(newItem); + this.Grid1.DataSource = monthReportItems; + this.Grid1.DataBind(); + } + #endregion + + #region 行事件 + /// + /// 删除 + /// + /// + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + jerqueSaveList(); + string rowID = this.Grid1.DataKeys[e.RowIndex][0].ToString(); + if (e.CommandName == "Delete") + { + foreach (var item in monthReportItems) + { + if (item.MonthReportItemId == rowID) + { + monthReportItems.Remove(item); + break; + } + } + Grid1.DataSource = monthReportItems; + Grid1.DataBind(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs index c00cffd9..6c1c58da 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs @@ -103,67 +103,886 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Form Form2; /// - /// drpUnitWorkId 控件。 + /// txtMonthReportCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.TextBox txtMonthReportCode; /// - /// txtDriverReporName 控件。 + /// txtMonthReportDate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtDriverReporName; + protected global::FineUIPro.DatePicker txtMonthReportDate; /// - /// txtDriverReportCode 控件。 + /// GroupPanel1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtDriverReportCode; + protected global::FineUIPro.GroupPanel GroupPanel1; /// - /// txtCompilePerson 控件。 + /// Form3 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtCompilePerson; + protected global::FineUIPro.Form Form3; /// - /// txtSubmitDate 控件。 + /// Label1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtSubmitDate; + protected global::FineUIPro.Label Label1; /// - /// txtNumber 控件。 + /// txtProjectOverview 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtNumber; + protected global::FineUIPro.TextArea txtProjectOverview; /// - /// txtRemark 控件。 + /// Label2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtRemark; + protected global::FineUIPro.Label Label2; + + /// + /// txtProjectBaseInfo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectBaseInfo; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEngineeringPlant 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtEngineeringPlant; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// txtProjectContract 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectContract; + + /// + /// GroupPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel2; + + /// + /// Form4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form4; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// txtMilestone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtMilestone; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// txtCompleteWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtCompleteWork; + + /// + /// Label7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label7; + + /// + /// txtProblemSituation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblemSituation; + + /// + /// GroupPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel3; + + /// + /// Form5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form5; + + /// + /// Label8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label8; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar ToolSearch; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// txtSortIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSortIndex; + + /// + /// txtWorkPackageType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkPackageType; + + /// + /// txtUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUnit; + + /// + /// txtDesignCount 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtDesignCount; + + /// + /// txtMonthPlan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtMonthPlan; + + /// + /// txtMonthActual 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMonthActual; + + /// + /// txtTotalPlan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtTotalPlan; + + /// + /// txtTatalActual 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtTatalActual; + + /// + /// txtCompletionRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCompletionRate; + + /// + /// Label9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label9; + + /// + /// Grid2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// txtTypeName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTypeName; + + /// + /// txtPV 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPV; + + /// + /// txtEV 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEV; + + /// + /// txtAC 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAC; + + /// + /// txtCV 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCV; + + /// + /// txtSV 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSV; + + /// + /// txtCPI 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCPI; + + /// + /// txtSPI 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSPI; + + /// + /// Grid3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid3; + + /// + /// txtTypeName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTypeName2; + + /// + /// txtPV2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPV2; + + /// + /// txtEV2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEV2; + + /// + /// txtAC2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAC2; + + /// + /// txtCV2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCV2; + + /// + /// txtSV2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSV2; + + /// + /// txtCPI2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCPI2; + + /// + /// txtSPI2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSPI2; + + /// + /// Label10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label10; + + /// + /// Label11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label11; + + /// + /// Label12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label12; + + /// + /// Label13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label13; + + /// + /// Label14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label14; + + /// + /// Label15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label15; + + /// + /// Label16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label16; + + /// + /// Label17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label17; + + /// + /// Label18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label18; + + /// + /// Label19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label19; + + /// + /// Label20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label20; + + /// + /// GroupPanel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel4; + + /// + /// Form6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form6; + + /// + /// txtBudget 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtBudget; + + /// + /// txtBudgetTotal 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtBudgetTotal; + + /// + /// GroupPanel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel5; + + /// + /// Form7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form7; + + /// + /// txtActualCost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtActualCost; + + /// + /// txtActualCostTotal 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtActualCostTotal; + + /// + /// GroupPanel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel6; + + /// + /// Form8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form8; + + /// + /// Label21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label21; + + /// + /// txtPublicationStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtPublicationStatus; + + /// + /// Label22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label22; + + /// + /// txtImplementationStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtImplementationStatus; + + /// + /// GroupPanel7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel7; + + /// + /// Form9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form9; + + /// + /// txtHSEManageSituation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtHSEManageSituation; + + /// + /// GroupPanel8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel8; + + /// + /// Form10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form10; + + /// + /// Label112 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label112; + + /// + /// txtNextMonthMilestone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthMilestone; + + /// + /// Label23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label23; + + /// + /// txtNextMonthCompleteWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthCompleteWork; + + /// + /// Label24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label24; + + /// + /// txtNextMonthSchedule 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthSchedule; + + /// + /// Label25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label25; + + /// + /// txtNextMonthDrivingCost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthDrivingCost; + + /// + /// GroupPanel9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel9; + + /// + /// Form11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form11; + + /// + /// Label26 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label26; + + /// + /// txtProblemsMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblemsMeasures; + + /// + /// Label27 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label27; + + /// + /// txtSolvedProblems 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtSolvedProblems; /// /// Panel3 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx new file mode 100644 index 00000000..ac2cfdf6 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx @@ -0,0 +1,52 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportPush.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverReport.MonthReportPush" %> + + + + + + + 月报推送给相关人员 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.cs new file mode 100644 index 00000000..452c7f75 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.cs @@ -0,0 +1,158 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.DriverReport +{ + public partial class MonthReportPush : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string id = Request.Params["id"]; + if (!string.IsNullOrEmpty(id)) + { + this.hdId.Text = id; + } + InitMenuTree(); + } + } + + #region 初始化树 + /// + /// 初始化树 + /// + /// 单位集合 + private void InitMenuTree() + { + this.tvPerson.Nodes.Clear(); + var units = BLL.UnitService.GetUnitByProjectIdList(this.CurrUser.LoginProjectId); + foreach (var item in units) + { + TreeNode rootNode = new TreeNode + { + Text = item.UnitName, + NodeID = item.UnitId, + EnableCheckBox = true, + EnableCheckEvent = true, + Expanded = true + }; + this.tvPerson.Nodes.Add(rootNode); + this.BoundTree(rootNode.Nodes, rootNode.NodeID); + } + } + + /// + /// 遍历增加子节点 + /// + /// + /// + private void BoundTree(TreeNodeCollection nodes, string superMenuId) + { + var menus = BLL.UserService.GetUserByUnitId(this.CurrUser.LoginProjectId, superMenuId); + foreach (var item in menus) + { + TreeNode chidNode = new TreeNode + { + Text = item.Text, + NodeID = item.Value, + EnableCheckBox = true, + EnableCheckEvent = true + }; + var monthReport = BLL.TestRun_MonthReportService.GetMonthReportById(this.hdId.Text.Trim()); + if (monthReport != null) + { + if (!string.IsNullOrEmpty(monthReport.PushPerson)) + { + if (monthReport.PushPerson.Contains(item.Value)) + { + chidNode.Checked = true; + chidNode.Expanded = true; + chidNode.Selectable = true; + } + } + } + nodes.Add(chidNode); + } + } + #endregion + + #region 全选、全不选 + /// + /// 全选、全不选 + /// + /// + /// + protected void tvPerson_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e) + { + if (e.Checked) + { + this.tvPerson.CheckAllNodes(e.Node.Nodes); + SetCheckParentNode(e.Node); + } + else + { + this.tvPerson.UncheckAllNodes(e.Node.Nodes); + } + } + + /// + /// 选中父节点 + /// + /// + private void SetCheckParentNode(TreeNode node) + { + if (node.ParentNode != null && node.ParentNode.NodeID != "0") + { + node.ParentNode.Checked = true; + if (node.ParentNode.ParentNode.NodeID != "0") + { + SetCheckParentNode(node.ParentNode); + } + } + } + #endregion + + #region 提交推送人员 + /// + /// 提交推送人员 + /// + /// + /// + protected void btnSubmit_Click(object sender, EventArgs e) + { + #region 保存推送人员 + string users = string.Empty; + TreeNode[] nodes = this.tvPerson.GetCheckedNodes(); + if (nodes.Length > 0) + { + foreach (TreeNode tn in nodes) + { + if (tn.NodeID != "0") + { + users += tn.NodeID + ","; + } + } + if (!string.IsNullOrEmpty(users)) + { + users = users.Substring(0, users.LastIndexOf(',')); + } + var monthReport = BLL.TestRun_MonthReportService.GetMonthReportById(this.hdId.Text.Trim()); + if (monthReport != null) + { + monthReport.PushPerson = users; + Funs.DB.SubmitChanges(); + ShowNotify("提交成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + #endregion + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.designer.cs new file mode 100644 index 00000000..e534a224 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.designer.cs @@ -0,0 +1,105 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.DriverReport { + + + public partial class MonthReportPush { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// tvPerson 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvPerson; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx new file mode 100644 index 00000000..adfcc414 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx @@ -0,0 +1,150 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportPushView.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverReport.MonthReportPushView" %> + + + + + + + 推送内容查看 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs new file mode 100644 index 00000000..d8b6ea5e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs @@ -0,0 +1,43 @@ +using System; + +namespace FineUIPro.Web.TestRun.DriverReport +{ + public partial class MonthReportPushView : PageBase + { + #region 页面加载 + /// + /// 页面加载 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string id = Request.Params["id"]; + if (!string.IsNullOrEmpty(id)) + { + Model.TestRun_MonthReport data = BLL.TestRun_MonthReportService.GetMonthReportById(id); + if (data != null) + { + this.hdId.Text = id; + this.txtMonthReportCode.Text = data.MonthReportCode; + this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : ""; + + this.txtMilestone.Text = data.Milestone; + this.txtCompleteWork.Text = data.CompleteWork; + this.txtProblemSituation.Text = data.ProblemSituation; + + this.txtNextMonthMilestone.Text = data.NextMonthMilestone; + this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork; + this.txtNextMonthSchedule.Text = data.NextMonthSchedule; + this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost; + + } + } + GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)"; + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs new file mode 100644 index 00000000..caab3950 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs @@ -0,0 +1,267 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.DriverReport { + + + public partial class MonthReportPushView { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtMonthReportCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMonthReportCode; + + /// + /// txtMonthReportDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonthReportDate; + + /// + /// GroupPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel2; + + /// + /// Form4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form4; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// txtMilestone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtMilestone; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// txtCompleteWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtCompleteWork; + + /// + /// Label7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label7; + + /// + /// txtProblemSituation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblemSituation; + + /// + /// GroupPanel8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel8; + + /// + /// Form10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form10; + + /// + /// Label112 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label112; + + /// + /// txtNextMonthMilestone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthMilestone; + + /// + /// Label23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label23; + + /// + /// txtNextMonthCompleteWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthCompleteWork; + + /// + /// Label24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label24; + + /// + /// txtNextMonthSchedule 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthSchedule; + + /// + /// Label25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label25; + + /// + /// txtNextMonthDrivingCost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthDrivingCost; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx new file mode 100644 index 00000000..47a99330 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx @@ -0,0 +1,548 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportView.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverReport.MonthReportView" %> + + + + + + + 查看开车月报告 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.cs new file mode 100644 index 00000000..1a7c5c2c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; + +namespace FineUIPro.Web.TestRun.DriverReport +{ + public partial class MonthReportView : PageBase + { + #region 定义集合 + /// + /// 工作包完成情况统计 + /// + public static List monthReportItems = new List(); + + /// + /// 开车绩效测量数据 + /// + public static List monthReportItems2 = new List(); + #endregion + + #region 页面加载 + /// + /// 页面加载 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string id = Request.Params["id"]; + if (!string.IsNullOrEmpty(id)) + { + Model.TestRun_MonthReport data = BLL.TestRun_MonthReportService.GetMonthReportById(id); + if (data != null) + { + this.hdId.Text = id; + this.txtMonthReportCode.Text = data.MonthReportCode; + this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : ""; + this.txtProjectOverview.Text = data.ProjectOverview; + this.txtProjectBaseInfo.Text = data.ProjectBaseInfo; + this.txtEngineeringPlant.Text = data.EngineeringPlant; + this.txtProjectContract.Text = data.ProjectContract; + this.txtMilestone.Text = data.Milestone; + this.txtCompleteWork.Text = data.CompleteWork; + this.txtProblemSituation.Text = data.ProblemSituation; + this.txtBudget.Text = data.Budget.HasValue ? data.Budget.ToString() : ""; + this.txtBudgetTotal.Text = data.BudgetTotal.HasValue ? data.BudgetTotal.ToString() : ""; + this.txtActualCost.Text = data.ActualCost.HasValue ? data.ActualCost.ToString() : ""; + this.txtActualCostTotal.Text = data.ActualCostTotal.HasValue ? data.ActualCostTotal.ToString() : ""; + this.txtPublicationStatus.Text = data.PublicationStatus; + this.txtImplementationStatus.Text = data.ImplementationStatus; + this.txtHSEManageSituation.Text = data.HSEManageSituation; + this.txtNextMonthMilestone.Text = data.NextMonthMilestone; + this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork; + this.txtNextMonthSchedule.Text = data.NextMonthSchedule; + this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost; + this.txtProblemsMeasures.Text = data.ProblemsMeasures; + this.txtSolvedProblems.Text = data.SolvedProblems; + } + + var items = BLL.TestRun_MonthReportItemService.GetMonthReportItemByReportId(this.hdId.Text); + if (items.Count > 0) + { + this.Grid1.DataSource = items; + this.Grid1.DataBind(); + } + + var items2 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "1"); + if (items2.Count > 0) + { + this.Grid2.DataSource = items2; + this.Grid2.DataBind(); + } + + var items3 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "2"); + if (items3.Count > 0) + { + this.Grid3.DataSource = items3; + this.Grid3.DataBind(); + } + } + GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)"; + } + } + #endregion + + #region 附件上传 + /// + /// 附件上传 + /// + /// + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.hdId.Text)) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", this.hdId.Text, BLL.Const.MonthReportMenuId))); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.designer.cs new file mode 100644 index 00000000..228ff735 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.designer.cs @@ -0,0 +1,771 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.DriverReport { + + + public partial class MonthReportView { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtMonthReportCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMonthReportCode; + + /// + /// txtMonthReportDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonthReportDate; + + /// + /// GroupPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel1; + + /// + /// Form3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form3; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtProjectOverview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectOverview; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// txtProjectBaseInfo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectBaseInfo; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEngineeringPlant 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtEngineeringPlant; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// txtProjectContract 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectContract; + + /// + /// GroupPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel2; + + /// + /// Form4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form4; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// txtMilestone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtMilestone; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// txtCompleteWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtCompleteWork; + + /// + /// Label7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label7; + + /// + /// txtProblemSituation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblemSituation; + + /// + /// GroupPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel3; + + /// + /// Form5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form5; + + /// + /// Label8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label8; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Label9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label9; + + /// + /// Grid2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// Grid3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid3; + + /// + /// Label10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label10; + + /// + /// Label11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label11; + + /// + /// Label12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label12; + + /// + /// Label13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label13; + + /// + /// Label14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label14; + + /// + /// Label15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label15; + + /// + /// Label16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label16; + + /// + /// Label17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label17; + + /// + /// Label18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label18; + + /// + /// Label19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label19; + + /// + /// Label20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label20; + + /// + /// GroupPanel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel4; + + /// + /// Form6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form6; + + /// + /// txtBudget 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtBudget; + + /// + /// txtBudgetTotal 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtBudgetTotal; + + /// + /// GroupPanel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel5; + + /// + /// Form7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form7; + + /// + /// txtActualCost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtActualCost; + + /// + /// txtActualCostTotal 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtActualCostTotal; + + /// + /// GroupPanel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel6; + + /// + /// Form8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form8; + + /// + /// Label21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label21; + + /// + /// txtPublicationStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtPublicationStatus; + + /// + /// Label22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label22; + + /// + /// txtImplementationStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtImplementationStatus; + + /// + /// GroupPanel7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel7; + + /// + /// Form9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form9; + + /// + /// txtHSEManageSituation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtHSEManageSituation; + + /// + /// GroupPanel8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel8; + + /// + /// Form10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form10; + + /// + /// Label112 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label112; + + /// + /// txtNextMonthMilestone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthMilestone; + + /// + /// Label23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label23; + + /// + /// txtNextMonthCompleteWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthCompleteWork; + + /// + /// Label24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label24; + + /// + /// txtNextMonthSchedule 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthSchedule; + + /// + /// Label25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label25; + + /// + /// txtNextMonthDrivingCost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNextMonthDrivingCost; + + /// + /// GroupPanel9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel9; + + /// + /// Form11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form11; + + /// + /// Label26 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label26; + + /// + /// txtProblemsMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProblemsMeasures; + + /// + /// Label27 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label27; + + /// + /// txtSolvedProblems 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtSolvedProblems; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx index 8dabe73c..73316757 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx @@ -20,7 +20,7 @@ - + <%----%> @@ -38,24 +38,24 @@ - + --%> + - - + FieldType="Date" Renderer="Date" HeaderText="编制时间" HeaderTextAlign="Center" Width="110px"> - - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs index 9c823633..7aab550c 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs @@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport GetButtonPower(); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("PropertyReportEdit.aspx") + "return false;"; - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); } } #endregion @@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport + @" WHERE report.ProjectId=@projectId AND report.ReportType='5'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - strSql += " AND report.UnitWorkId=@unitWorkId"; - listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); - } + //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND report.UnitWorkId=@unitWorkId"; + // listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); + //} if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim())) { strSql += " AND report.DriverReporName LIKE @DriverReporName"; diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs index 77f30347..ab6e7b91 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs @@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.Toolbar ToolSearch; - /// - /// drpUnitWorkId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpUnitWorkId; - /// /// txtDriverReporName 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx index d343f975..40d9a7e1 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx @@ -34,20 +34,20 @@ - + <%-- - + --%> - + - + @@ -59,15 +59,15 @@ - + - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs index 37328c76..f8682e46 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport { if (!IsPostBack) { - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) @@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport if (data != null) { this.hdId.Text = id; - if (!string.IsNullOrEmpty(data.UnitWorkId)) - { - this.drpUnitWorkId.SelectedValue = data.UnitWorkId; - } + //if (!string.IsNullOrEmpty(data.UnitWorkId)) + //{ + // this.drpUnitWorkId.SelectedValue = data.UnitWorkId; + //} this.txtDriverReportCode.Text = data.DriverReportCode; this.txtDriverReporName.Text = data.DriverReporName; this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson); this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : ""; - this.txtNumber.Text = data.Number; + //this.txtNumber.Text = data.Number; this.txtRemark.Text = data.Remark; } } @@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport { string id = Request.Params["id"]; Model.Driver_DriverReport newData = new Model.Driver_DriverReport(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } + //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; + //} newData.DriverReportCode = this.txtDriverReportCode.Text.Trim(); newData.DriverReporName = this.txtDriverReporName.Text.Trim(); newData.CompilePerson = this.CurrUser.UserId; newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim()); - newData.Number = this.txtNumber.Text.Trim(); + //newData.Number = this.txtNumber.Text.Trim(); newData.Remark = this.txtRemark.Text.Trim(); newData.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(id)) diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs index dd497401..46c7a283 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs @@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport { protected global::FineUIPro.Form Form2; /// - /// drpUnitWorkId 控件。 + /// txtDriverReportCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.TextBox txtDriverReportCode; /// /// txtDriverReporName 控件。 @@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.TextBox txtDriverReporName; - /// - /// txtDriverReportCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDriverReportCode; - /// /// txtCompilePerson 控件。 /// @@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport { /// protected global::FineUIPro.DatePicker txtSubmitDate; - /// - /// txtNumber 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtNumber; - /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx index e75ec969..0a5dc407 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx @@ -20,7 +20,7 @@ - + <%----%> @@ -38,20 +38,20 @@ - + --%> + - - + FieldType="Date" Renderer="Date" HeaderText="总结日期" HeaderTextAlign="Center" Width="110px"> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs index 6ba5691b..47e0cb53 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs @@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary GetButtonPower(); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("CompleteSummaryEdit.aspx") + "return false;"; - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); } } #endregion @@ -43,11 +43,11 @@ namespace FineUIPro.Web.TestRun.DriverSummary + @" WHERE summary.ProjectId=@projectId AND summary.SummaryType='2'"; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - strSql += " AND summary.UnitWorkId=@unitWorkId"; - listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); - } + //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND summary.UnitWorkId=@unitWorkId"; + // listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue)); + //} if (!string.IsNullOrEmpty(this.txtSummary.Text.Trim())) { strSql += " AND summary.Summary LIKE @Summary"; diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs index c92a5bb4..eb61c214 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs @@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary { /// protected global::FineUIPro.Toolbar ToolSearch; - /// - /// drpUnitWorkId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpUnitWorkId; - /// /// txtSummary 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx index 167b3516..b6c3759d 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx @@ -34,10 +34,16 @@ - + <%-- + --%> + + + + + @@ -45,12 +51,6 @@ - - - - - - @@ -59,7 +59,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs index 326d6f70..60578150 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs @@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary { if (!IsPostBack) { - BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); string id = Request.Params["id"]; if (!string.IsNullOrEmpty(id)) @@ -24,10 +24,10 @@ namespace FineUIPro.Web.TestRun.DriverSummary if (data != null) { this.hdId.Text = id; - if (!string.IsNullOrEmpty(data.UnitWorkId)) - { - this.drpUnitWorkId.SelectedValue = data.UnitWorkId; - } + //if (!string.IsNullOrEmpty(data.UnitWorkId)) + //{ + // this.drpUnitWorkId.SelectedValue = data.UnitWorkId; + //} this.txtDriverSummaryCode.Text = data.DriverSummaryCode; this.txtSummary.Text = data.Summary; this.txtSummaryPerson.Text = BLL.UserService.GetUserNameByUserId(data.SummaryPerson); @@ -70,10 +70,10 @@ namespace FineUIPro.Web.TestRun.DriverSummary { string id = Request.Params["id"]; Model.Driver_DriverSummary newData = new Model.Driver_DriverSummary(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } + //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + //{ + // newData.UnitWorkId = this.drpUnitWorkId.SelectedValue; + //} newData.DriverSummaryCode = this.txtDriverSummaryCode.Text.Trim(); newData.Summary = this.txtSummary.Text.Trim(); newData.SummaryPerson = this.CurrUser.UserId; diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs index 0399124d..36532e30 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs @@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverSummary { protected global::FineUIPro.Form Form2; /// - /// drpUnitWorkId 控件。 + /// txtDriverSummaryCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUnitWorkId; + protected global::FineUIPro.TextBox txtDriverSummaryCode; /// /// txtSummary 控件。 @@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary { /// protected global::FineUIPro.TextArea txtSummary; - /// - /// txtDriverSummaryCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDriverSummaryCode; - /// /// txtSummaryPerson 控件。 /// diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 6605fbff..3fd25d2f 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,11 @@ +<<<<<<< HEAD + +======= +>>>>>>> c3f952cc792413e938e14d320464c4881181d4f8 diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 04118906..ba88ce1f 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - - + + + + @@ -69,11 +69,9 @@ - - @@ -99,8 +97,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 4d3b9e97..91d9fd84 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,21 +1,3 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index cc7e0f27..7f1d1e31 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,6 +83,9 @@ +<<<<<<< HEAD +======= +>>>>>>> c3f952cc792413e938e14d320464c4881181d4f8 \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 39e735c5..9246461d 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1430,6 +1430,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2309,6 +2312,15 @@ namespace Model partial void InsertTestRun_InspectTermApproveRecords(TestRun_InspectTermApproveRecords instance); partial void UpdateTestRun_InspectTermApproveRecords(TestRun_InspectTermApproveRecords instance); partial void DeleteTestRun_InspectTermApproveRecords(TestRun_InspectTermApproveRecords instance); + partial void InsertTestRun_MonthReport(TestRun_MonthReport instance); + partial void UpdateTestRun_MonthReport(TestRun_MonthReport instance); + partial void DeleteTestRun_MonthReport(TestRun_MonthReport instance); + partial void InsertTestRun_MonthReportItem(TestRun_MonthReportItem instance); + partial void UpdateTestRun_MonthReportItem(TestRun_MonthReportItem instance); + partial void DeleteTestRun_MonthReportItem(TestRun_MonthReportItem instance); + partial void InsertTestRun_MonthReportItem2(TestRun_MonthReportItem2 instance); + partial void UpdateTestRun_MonthReportItem2(TestRun_MonthReportItem2 instance); + partial void DeleteTestRun_MonthReportItem2(TestRun_MonthReportItem2 instance); partial void InsertTestRun_PersonTrainPlan(TestRun_PersonTrainPlan instance); partial void UpdateTestRun_PersonTrainPlan(TestRun_PersonTrainPlan instance); partial void DeleteTestRun_PersonTrainPlan(TestRun_PersonTrainPlan instance); @@ -6352,6 +6364,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligations + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -8704,6 +8724,30 @@ namespace Model } } + public System.Data.Linq.Table TestRun_MonthReport + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table TestRun_MonthReportItem + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table TestRun_MonthReportItem2 + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table TestRun_PersonTrainPlan { get @@ -21221,8 +21265,6 @@ namespace Model private string _CodeRule; - private EntitySet _Doc_DocManage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21239,7 +21281,6 @@ namespace Model public Base_DocType() { - this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21323,19 +21364,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManage - { - get - { - return this._Doc_DocManage; - } - set - { - this._Doc_DocManage.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -21355,18 +21383,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = this; - } - - private void detach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -26204,6 +26220,8 @@ namespace Model private EntitySet _Sys_UserRead; + private EntitySet _TestRun_MonthReport; + private EntitySet _TestRun_PersonTrainPlan; private EntitySet _TestRun_TrainContract; @@ -26609,6 +26627,7 @@ namespace Model this._Sys_RoleItem = new EntitySet(new Action(this.attach_Sys_RoleItem), new Action(this.detach_Sys_RoleItem)); this._Sys_User = new EntitySet(new Action(this.attach_Sys_User), new Action(this.detach_Sys_User)); this._Sys_UserRead = new EntitySet(new Action(this.attach_Sys_UserRead), new Action(this.detach_Sys_UserRead)); + this._TestRun_MonthReport = new EntitySet(new Action(this.attach_TestRun_MonthReport), new Action(this.detach_TestRun_MonthReport)); this._TestRun_PersonTrainPlan = new EntitySet(new Action(this.attach_TestRun_PersonTrainPlan), new Action(this.detach_TestRun_PersonTrainPlan)); this._TestRun_TrainContract = new EntitySet(new Action(this.attach_TestRun_TrainContract), new Action(this.detach_TestRun_TrainContract)); this._TestRun_TrainRecords = new EntitySet(new Action(this.attach_TestRun_TrainRecords), new Action(this.detach_TestRun_TrainRecords)); @@ -31033,6 +31052,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReport_Base_Project", Storage="_TestRun_MonthReport", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet TestRun_MonthReport + { + get + { + return this._TestRun_MonthReport; + } + set + { + this._TestRun_MonthReport.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_PersonTrainPlan_Base_Project", Storage="_TestRun_PersonTrainPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet TestRun_PersonTrainPlan { @@ -34591,6 +34623,18 @@ namespace Model entity.Base_Project = null; } + private void attach_TestRun_MonthReport(TestRun_MonthReport entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_TestRun_MonthReport(TestRun_MonthReport entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_TestRun_PersonTrainPlan(TestRun_PersonTrainPlan entity) { this.SendPropertyChanging(); @@ -118154,8 +118198,6 @@ namespace Model private EntityRef _Base_CNProfessional; - private EntityRef _Base_DocType; - private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -118207,7 +118249,6 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); - this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -118286,10 +118327,6 @@ namespace Model { if ((this._DocTypeId != value)) { - if (this._Base_DocType.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -118609,40 +118646,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] - public Base_DocType Base_DocType - { - get - { - return this._Base_DocType.Entity; - } - set - { - Base_DocType previousValue = this._Base_DocType.Entity; - if (((previousValue != value) - || (this._Base_DocType.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_DocType.Entity = null; - previousValue.Doc_DocManage.Remove(this); - } - this._Base_DocType.Entity = value; - if ((value != null)) - { - value.Doc_DocManage.Add(this); - this._DocTypeId = value.DocTypeId; - } - else - { - this._DocTypeId = default(string); - } - this.SendPropertyChanged("Base_DocType"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -118813,8 +118816,6 @@ namespace Model private EntityRef _Doc_DocManage; - private EntityRef _Sys_User; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -118838,7 +118839,6 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -118886,7 +118886,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] public string ApproveMan { get @@ -118897,10 +118897,6 @@ namespace Model { if ((this._ApproveMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -119024,40 +119020,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.Doc_DocManageApprove.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.Doc_DocManageApprove.Add(this); - this._ApproveMan = value.UserId; - } - else - { - this._ApproveMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -121894,12 +121856,12 @@ namespace Model private string _MeetingCode; + private string _States; + private string _CompileMan; private System.Nullable _CompileDate; - private string _States; - private EntityRef _Base_Project; private EntityRef _WBS_UnitWork; @@ -121936,12 +121898,12 @@ namespace Model partial void OnRemarkChanged(); partial void OnMeetingCodeChanging(string value); partial void OnMeetingCodeChanged(); + partial void OnStatesChanging(string value); + partial void OnStatesChanged(); partial void OnCompileManChanging(string value); partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); partial void OnCompileDateChanged(); - partial void OnStatesChanging(string value); - partial void OnStatesChanged(); #endregion public Driver_Meeting() @@ -122220,6 +122182,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")] + public string States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] public string CompileMan { @@ -122260,26 +122242,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")] - public string States - { - get - { - return this._States; - } - set - { - if ((this._States != value)) - { - this.OnStatesChanging(value); - this.SendPropertyChanging(); - this._States = value; - this.SendPropertyChanged("States"); - this.OnStatesChanged(); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_Meeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -230625,6 +230587,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] + public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligations() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligations.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligations.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -236824,6 +237009,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligations; + private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -237096,6 +237283,7 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -239276,6 +239464,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligations + { + get + { + return this._Manager_Month_ComplianceObligations; + } + set + { + this._Manager_Month_ComplianceObligations.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -239857,6 +240058,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -267882,7 +268095,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -267896,18 +268109,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + + private string _SubInspectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -267924,8 +268139,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -267938,18 +268153,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -268077,22 +268294,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId { get { - return this._SubInspectId; + return this._QuestionTechnologyId; } set { - if ((this._SubInspectId != value)) + if ((this._QuestionTechnologyId != value)) { - this.OnSubInspectIdChanging(value); + this.OnQuestionTechnologyIdChanging(value); this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); } } } @@ -268217,26 +268434,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -268257,26 +268454,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -268337,6 +268514,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -268378,14 +268615,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -268404,14 +268641,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -268559,26 +268796,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -268639,6 +268856,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -269571,7 +269808,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -269694,6 +269931,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -269702,6 +269945,12 @@ namespace Model private string _Owner; + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -269712,9 +269961,7 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; + private System.Nullable _WanderIsComplete; private System.Nullable _SubcontractorAllPassData; @@ -269724,35 +269971,25 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderIsComplete; - private System.Nullable _WanderCompleteData; + private System.Nullable _WorkPackType; + private System.Nullable _IsSiteImplement; - private string _SiteImplementUser; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - private System.Nullable _InspectIsClose; - private string _InspectIsCloseUser; - private System.Nullable _InspectCloseData; - private System.Nullable _IsUnifyWanderAbout; + private string _InspectIsCloseUser; - private System.Nullable _UnifyWanderAboutData; + private string _PropertyTechnologyId; - private string _UnifyWanderAboutOpinion; + private System.Nullable _RecordUploadData; - private System.Nullable _InspectTime; + private System.Nullable _SiteImplementConfirmData; - private string _AddUser; - - private System.Nullable _AddTime; + private string _SiteImplementUser; #region 可扩展性方法定义 partial void OnLoaded(); @@ -269774,6 +270011,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -269782,6 +270025,12 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -269792,10 +270041,8 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -269804,36 +270051,26 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); partial void OnInspectCloseDataChanging(System.Nullable value); partial void OnInspectCloseDataChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); #endregion public PreRun_SubInspectTerm() @@ -270001,6 +270238,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -270081,6 +270378,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -270181,42 +270538,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete { get { - return this._WorkPackType; + return this._WanderIsComplete; } set { - if ((this._WorkPackType != value)) + if ((this._WanderIsComplete != value)) { - this.OnWorkPackTypeChanging(value); + this.OnWanderIsCompleteChanging(value); this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); } } } @@ -270301,26 +270638,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete - { - get - { - return this._WanderIsComplete; - } - set - { - if ((this._WanderIsComplete != value)) - { - this.OnWanderIsCompleteChanging(value); - this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -270341,6 +270658,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -270361,66 +270698,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] public System.Nullable InspectIsClose { @@ -270441,26 +270718,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] public System.Nullable InspectCloseData { @@ -270481,122 +270738,102 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] + public string InspectIsCloseUser { get { - return this._IsUnifyWanderAbout; + return this._InspectIsCloseUser; } set { - if ((this._IsUnifyWanderAbout != value)) + if ((this._InspectIsCloseUser != value)) { - this.OnIsUnifyWanderAboutChanging(value); + this.OnInspectIsCloseUserChanging(value); this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] + public string PropertyTechnologyId { get { - return this._UnifyWanderAboutData; + return this._PropertyTechnologyId; } set { - if ((this._UnifyWanderAboutData != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnUnifyWanderAboutDataChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._UnifyWanderAboutOpinion; + return this._RecordUploadData; } set { - if ((this._UnifyWanderAboutOpinion != value)) + if ((this._RecordUploadData != value)) { - this.OnUnifyWanderAboutOpinionChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData { get { - return this._InspectTime; + return this._SiteImplementConfirmData; } set { - if ((this._InspectTime != value)) + if ((this._SiteImplementConfirmData != value)) { - this.OnInspectTimeChanging(value); + this.OnSiteImplementConfirmDataChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] + public string SiteImplementUser { get { - return this._AddUser; + return this._SiteImplementUser; } set { - if ((this._AddUser != value)) + if ((this._SiteImplementUser != value)) { - this.OnAddUserChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -270664,22 +270901,6 @@ namespace Model private string _Owner; - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -270692,6 +270913,22 @@ namespace Model private System.Nullable _Sort; + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -270732,22 +270969,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -270760,6 +270981,22 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -271127,166 +271364,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -271307,7 +271384,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] public string PropertyTechnologyId { get @@ -271407,6 +271484,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -272408,8 +272645,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -272420,11 +272655,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -272440,6 +272673,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -272476,8 +272713,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -272488,12 +272723,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -272508,6 +272741,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -272817,26 +273054,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -272937,26 +273154,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -272977,22 +273174,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -273137,6 +273334,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -273849,7 +274086,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -340149,8 +340386,6 @@ namespace Model private EntitySet _Doc_DocManage; - private EntitySet _Doc_DocManageApprove; - private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -340860,7 +341095,6 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); - this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -343237,19 +343471,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManageApprove - { - get - { - return this._Doc_DocManageApprove; - } - set - { - this._Doc_DocManageApprove.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -347704,18 +347925,6 @@ namespace Model entity.Sys_User = null; } - private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging(); @@ -362561,6 +362770,1451 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_MonthReport")] + public partial class TestRun_MonthReport : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MonthReportId; + + private string _ProjectId; + + private string _MonthReportCode; + + private System.Nullable _MonthReportDate; + + private string _ProjectOverview; + + private string _ProjectBaseInfo; + + private string _EngineeringPlant; + + private string _ProjectContract; + + private string _Milestone; + + private string _CompleteWork; + + private string _ProblemSituation; + + private System.Nullable _Budget; + + private System.Nullable _BudgetTotal; + + private System.Nullable _ActualCost; + + private System.Nullable _ActualCostTotal; + + private string _PublicationStatus; + + private string _ImplementationStatus; + + private string _HSEManageSituation; + + private string _NextMonthMilestone; + + private string _NextMonthCompleteWork; + + private string _NextMonthSchedule; + + private string _NextMonthDrivingCost; + + private string _ProblemsMeasures; + + private string _SolvedProblems; + + private string _PushPerson; + + private EntityRef _Base_Project; + + private EntitySet _TestRun_MonthReportItem; + + private EntitySet _TestRun_MonthReportItem2; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnMonthReportCodeChanging(string value); + partial void OnMonthReportCodeChanged(); + partial void OnMonthReportDateChanging(System.Nullable value); + partial void OnMonthReportDateChanged(); + partial void OnProjectOverviewChanging(string value); + partial void OnProjectOverviewChanged(); + partial void OnProjectBaseInfoChanging(string value); + partial void OnProjectBaseInfoChanged(); + partial void OnEngineeringPlantChanging(string value); + partial void OnEngineeringPlantChanged(); + partial void OnProjectContractChanging(string value); + partial void OnProjectContractChanged(); + partial void OnMilestoneChanging(string value); + partial void OnMilestoneChanged(); + partial void OnCompleteWorkChanging(string value); + partial void OnCompleteWorkChanged(); + partial void OnProblemSituationChanging(string value); + partial void OnProblemSituationChanged(); + partial void OnBudgetChanging(System.Nullable value); + partial void OnBudgetChanged(); + partial void OnBudgetTotalChanging(System.Nullable value); + partial void OnBudgetTotalChanged(); + partial void OnActualCostChanging(System.Nullable value); + partial void OnActualCostChanged(); + partial void OnActualCostTotalChanging(System.Nullable value); + partial void OnActualCostTotalChanged(); + partial void OnPublicationStatusChanging(string value); + partial void OnPublicationStatusChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnHSEManageSituationChanging(string value); + partial void OnHSEManageSituationChanged(); + partial void OnNextMonthMilestoneChanging(string value); + partial void OnNextMonthMilestoneChanged(); + partial void OnNextMonthCompleteWorkChanging(string value); + partial void OnNextMonthCompleteWorkChanged(); + partial void OnNextMonthScheduleChanging(string value); + partial void OnNextMonthScheduleChanged(); + partial void OnNextMonthDrivingCostChanging(string value); + partial void OnNextMonthDrivingCostChanged(); + partial void OnProblemsMeasuresChanging(string value); + partial void OnProblemsMeasuresChanged(); + partial void OnSolvedProblemsChanging(string value); + partial void OnSolvedProblemsChanged(); + partial void OnPushPersonChanging(string value); + partial void OnPushPersonChanged(); + #endregion + + public TestRun_MonthReport() + { + this._Base_Project = default(EntityRef); + this._TestRun_MonthReportItem = new EntitySet(new Action(this.attach_TestRun_MonthReportItem), new Action(this.detach_TestRun_MonthReportItem)); + this._TestRun_MonthReportItem2 = new EntitySet(new Action(this.attach_TestRun_MonthReportItem2), new Action(this.detach_TestRun_MonthReportItem2)); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportCode", DbType="NVarChar(50)")] + public string MonthReportCode + { + get + { + return this._MonthReportCode; + } + set + { + if ((this._MonthReportCode != value)) + { + this.OnMonthReportCodeChanging(value); + this.SendPropertyChanging(); + this._MonthReportCode = value; + this.SendPropertyChanged("MonthReportCode"); + this.OnMonthReportCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportDate", DbType="DateTime")] + public System.Nullable MonthReportDate + { + get + { + return this._MonthReportDate; + } + set + { + if ((this._MonthReportDate != value)) + { + this.OnMonthReportDateChanging(value); + this.SendPropertyChanging(); + this._MonthReportDate = value; + this.SendPropertyChanged("MonthReportDate"); + this.OnMonthReportDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectOverview", DbType="NVarChar(1000)")] + public string ProjectOverview + { + get + { + return this._ProjectOverview; + } + set + { + if ((this._ProjectOverview != value)) + { + this.OnProjectOverviewChanging(value); + this.SendPropertyChanging(); + this._ProjectOverview = value; + this.SendPropertyChanged("ProjectOverview"); + this.OnProjectOverviewChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectBaseInfo", DbType="NVarChar(2000)")] + public string ProjectBaseInfo + { + get + { + return this._ProjectBaseInfo; + } + set + { + if ((this._ProjectBaseInfo != value)) + { + this.OnProjectBaseInfoChanging(value); + this.SendPropertyChanging(); + this._ProjectBaseInfo = value; + this.SendPropertyChanged("ProjectBaseInfo"); + this.OnProjectBaseInfoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EngineeringPlant", DbType="NVarChar(2000)")] + public string EngineeringPlant + { + get + { + return this._EngineeringPlant; + } + set + { + if ((this._EngineeringPlant != value)) + { + this.OnEngineeringPlantChanging(value); + this.SendPropertyChanging(); + this._EngineeringPlant = value; + this.SendPropertyChanged("EngineeringPlant"); + this.OnEngineeringPlantChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectContract", DbType="NVarChar(2000)")] + public string ProjectContract + { + get + { + return this._ProjectContract; + } + set + { + if ((this._ProjectContract != value)) + { + this.OnProjectContractChanging(value); + this.SendPropertyChanging(); + this._ProjectContract = value; + this.SendPropertyChanged("ProjectContract"); + this.OnProjectContractChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Milestone", DbType="NVarChar(1000)")] + public string Milestone + { + get + { + return this._Milestone; + } + set + { + if ((this._Milestone != value)) + { + this.OnMilestoneChanging(value); + this.SendPropertyChanging(); + this._Milestone = value; + this.SendPropertyChanged("Milestone"); + this.OnMilestoneChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteWork", DbType="NVarChar(1000)")] + public string CompleteWork + { + get + { + return this._CompleteWork; + } + set + { + if ((this._CompleteWork != value)) + { + this.OnCompleteWorkChanging(value); + this.SendPropertyChanging(); + this._CompleteWork = value; + this.SendPropertyChanged("CompleteWork"); + this.OnCompleteWorkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemSituation", DbType="NVarChar(1000)")] + public string ProblemSituation + { + get + { + return this._ProblemSituation; + } + set + { + if ((this._ProblemSituation != value)) + { + this.OnProblemSituationChanging(value); + this.SendPropertyChanging(); + this._ProblemSituation = value; + this.SendPropertyChanged("ProblemSituation"); + this.OnProblemSituationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Budget", DbType="Decimal(18,2)")] + public System.Nullable Budget + { + get + { + return this._Budget; + } + set + { + if ((this._Budget != value)) + { + this.OnBudgetChanging(value); + this.SendPropertyChanging(); + this._Budget = value; + this.SendPropertyChanged("Budget"); + this.OnBudgetChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BudgetTotal", DbType="Decimal(18,2)")] + public System.Nullable BudgetTotal + { + get + { + return this._BudgetTotal; + } + set + { + if ((this._BudgetTotal != value)) + { + this.OnBudgetTotalChanging(value); + this.SendPropertyChanging(); + this._BudgetTotal = value; + this.SendPropertyChanged("BudgetTotal"); + this.OnBudgetTotalChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualCost", DbType="Decimal(18,2)")] + public System.Nullable ActualCost + { + get + { + return this._ActualCost; + } + set + { + if ((this._ActualCost != value)) + { + this.OnActualCostChanging(value); + this.SendPropertyChanging(); + this._ActualCost = value; + this.SendPropertyChanged("ActualCost"); + this.OnActualCostChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualCostTotal", DbType="Decimal(18,2)")] + public System.Nullable ActualCostTotal + { + get + { + return this._ActualCostTotal; + } + set + { + if ((this._ActualCostTotal != value)) + { + this.OnActualCostTotalChanging(value); + this.SendPropertyChanging(); + this._ActualCostTotal = value; + this.SendPropertyChanged("ActualCostTotal"); + this.OnActualCostTotalChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PublicationStatus", DbType="NVarChar(500)")] + public string PublicationStatus + { + get + { + return this._PublicationStatus; + } + set + { + if ((this._PublicationStatus != value)) + { + this.OnPublicationStatusChanging(value); + this.SendPropertyChanging(); + this._PublicationStatus = value; + this.SendPropertyChanged("PublicationStatus"); + this.OnPublicationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HSEManageSituation", DbType="NVarChar(500)")] + public string HSEManageSituation + { + get + { + return this._HSEManageSituation; + } + set + { + if ((this._HSEManageSituation != value)) + { + this.OnHSEManageSituationChanging(value); + this.SendPropertyChanging(); + this._HSEManageSituation = value; + this.SendPropertyChanged("HSEManageSituation"); + this.OnHSEManageSituationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthMilestone", DbType="NVarChar(1000)")] + public string NextMonthMilestone + { + get + { + return this._NextMonthMilestone; + } + set + { + if ((this._NextMonthMilestone != value)) + { + this.OnNextMonthMilestoneChanging(value); + this.SendPropertyChanging(); + this._NextMonthMilestone = value; + this.SendPropertyChanged("NextMonthMilestone"); + this.OnNextMonthMilestoneChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthCompleteWork", DbType="NVarChar(1000)")] + public string NextMonthCompleteWork + { + get + { + return this._NextMonthCompleteWork; + } + set + { + if ((this._NextMonthCompleteWork != value)) + { + this.OnNextMonthCompleteWorkChanging(value); + this.SendPropertyChanging(); + this._NextMonthCompleteWork = value; + this.SendPropertyChanged("NextMonthCompleteWork"); + this.OnNextMonthCompleteWorkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthSchedule", DbType="NVarChar(1000)")] + public string NextMonthSchedule + { + get + { + return this._NextMonthSchedule; + } + set + { + if ((this._NextMonthSchedule != value)) + { + this.OnNextMonthScheduleChanging(value); + this.SendPropertyChanging(); + this._NextMonthSchedule = value; + this.SendPropertyChanged("NextMonthSchedule"); + this.OnNextMonthScheduleChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthDrivingCost", DbType="NVarChar(1000)")] + public string NextMonthDrivingCost + { + get + { + return this._NextMonthDrivingCost; + } + set + { + if ((this._NextMonthDrivingCost != value)) + { + this.OnNextMonthDrivingCostChanging(value); + this.SendPropertyChanging(); + this._NextMonthDrivingCost = value; + this.SendPropertyChanged("NextMonthDrivingCost"); + this.OnNextMonthDrivingCostChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemsMeasures", DbType="NVarChar(2000)")] + public string ProblemsMeasures + { + get + { + return this._ProblemsMeasures; + } + set + { + if ((this._ProblemsMeasures != value)) + { + this.OnProblemsMeasuresChanging(value); + this.SendPropertyChanging(); + this._ProblemsMeasures = value; + this.SendPropertyChanged("ProblemsMeasures"); + this.OnProblemsMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SolvedProblems", DbType="NVarChar(2000)")] + public string SolvedProblems + { + get + { + return this._SolvedProblems; + } + set + { + if ((this._SolvedProblems != value)) + { + this.OnSolvedProblemsChanging(value); + this.SendPropertyChanging(); + this._SolvedProblems = value; + this.SendPropertyChanged("SolvedProblems"); + this.OnSolvedProblemsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PushPerson", DbType="NVarChar(1000)")] + public string PushPerson + { + get + { + return this._PushPerson; + } + set + { + if ((this._PushPerson != value)) + { + this.OnPushPersonChanging(value); + this.SendPropertyChanging(); + this._PushPerson = value; + this.SendPropertyChanged("PushPerson"); + this.OnPushPersonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReport_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.TestRun_MonthReport.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.TestRun_MonthReport.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem_TestRun_MonthReport", Storage="_TestRun_MonthReportItem", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet TestRun_MonthReportItem + { + get + { + return this._TestRun_MonthReportItem; + } + set + { + this._TestRun_MonthReportItem.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem2_TestRun_MonthReport", Storage="_TestRun_MonthReportItem2", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet TestRun_MonthReportItem2 + { + get + { + return this._TestRun_MonthReportItem2; + } + set + { + this._TestRun_MonthReportItem2.Assign(value); + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + private void attach_TestRun_MonthReportItem(TestRun_MonthReportItem entity) + { + this.SendPropertyChanging(); + entity.TestRun_MonthReport = this; + } + + private void detach_TestRun_MonthReportItem(TestRun_MonthReportItem entity) + { + this.SendPropertyChanging(); + entity.TestRun_MonthReport = null; + } + + private void attach_TestRun_MonthReportItem2(TestRun_MonthReportItem2 entity) + { + this.SendPropertyChanging(); + entity.TestRun_MonthReport = this; + } + + private void detach_TestRun_MonthReportItem2(TestRun_MonthReportItem2 entity) + { + this.SendPropertyChanging(); + entity.TestRun_MonthReport = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_MonthReportItem")] + public partial class TestRun_MonthReportItem : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MonthReportItemId; + + private string _MonthReportId; + + private string _SortIndex; + + private string _WorkPackageType; + + private string _Unit; + + private System.Nullable _DesignCount; + + private System.Nullable _MonthPlan; + + private string _MonthActual; + + private System.Nullable _TotalPlan; + + private System.Nullable _TatalActual; + + private string _CompletionRate; + + private EntityRef _TestRun_MonthReport; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMonthReportItemIdChanging(string value); + partial void OnMonthReportItemIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnSortIndexChanging(string value); + partial void OnSortIndexChanged(); + partial void OnWorkPackageTypeChanging(string value); + partial void OnWorkPackageTypeChanged(); + partial void OnUnitChanging(string value); + partial void OnUnitChanged(); + partial void OnDesignCountChanging(System.Nullable value); + partial void OnDesignCountChanged(); + partial void OnMonthPlanChanging(System.Nullable value); + partial void OnMonthPlanChanged(); + partial void OnMonthActualChanging(string value); + partial void OnMonthActualChanged(); + partial void OnTotalPlanChanging(System.Nullable value); + partial void OnTotalPlanChanged(); + partial void OnTatalActualChanging(System.Nullable value); + partial void OnTatalActualChanged(); + partial void OnCompletionRateChanging(string value); + partial void OnCompletionRateChanged(); + #endregion + + public TestRun_MonthReportItem() + { + this._TestRun_MonthReport = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MonthReportItemId + { + get + { + return this._MonthReportItemId; + } + set + { + if ((this._MonthReportItemId != value)) + { + this.OnMonthReportItemIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportItemId = value; + this.SendPropertyChanged("MonthReportItemId"); + this.OnMonthReportItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._TestRun_MonthReport.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="NChar(10)")] + public string SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageType", DbType="NVarChar(50)")] + public string WorkPackageType + { + get + { + return this._WorkPackageType; + } + set + { + if ((this._WorkPackageType != value)) + { + this.OnWorkPackageTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackageType = value; + this.SendPropertyChanged("WorkPackageType"); + this.OnWorkPackageTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NChar(10)")] + public string Unit + { + get + { + return this._Unit; + } + set + { + if ((this._Unit != value)) + { + this.OnUnitChanging(value); + this.SendPropertyChanging(); + this._Unit = value; + this.SendPropertyChanged("Unit"); + this.OnUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignCount", DbType="Int")] + public System.Nullable DesignCount + { + get + { + return this._DesignCount; + } + set + { + if ((this._DesignCount != value)) + { + this.OnDesignCountChanging(value); + this.SendPropertyChanging(); + this._DesignCount = value; + this.SendPropertyChanged("DesignCount"); + this.OnDesignCountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthPlan", DbType="Int")] + public System.Nullable MonthPlan + { + get + { + return this._MonthPlan; + } + set + { + if ((this._MonthPlan != value)) + { + this.OnMonthPlanChanging(value); + this.SendPropertyChanging(); + this._MonthPlan = value; + this.SendPropertyChanged("MonthPlan"); + this.OnMonthPlanChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthActual", DbType="NVarChar(50)")] + public string MonthActual + { + get + { + return this._MonthActual; + } + set + { + if ((this._MonthActual != value)) + { + this.OnMonthActualChanging(value); + this.SendPropertyChanging(); + this._MonthActual = value; + this.SendPropertyChanged("MonthActual"); + this.OnMonthActualChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlan", DbType="Int")] + public System.Nullable TotalPlan + { + get + { + return this._TotalPlan; + } + set + { + if ((this._TotalPlan != value)) + { + this.OnTotalPlanChanging(value); + this.SendPropertyChanging(); + this._TotalPlan = value; + this.SendPropertyChanged("TotalPlan"); + this.OnTotalPlanChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TatalActual", DbType="Int")] + public System.Nullable TatalActual + { + get + { + return this._TatalActual; + } + set + { + if ((this._TatalActual != value)) + { + this.OnTatalActualChanging(value); + this.SendPropertyChanging(); + this._TatalActual = value; + this.SendPropertyChanged("TatalActual"); + this.OnTatalActualChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletionRate", DbType="NVarChar(50)")] + public string CompletionRate + { + get + { + return this._CompletionRate; + } + set + { + if ((this._CompletionRate != value)) + { + this.OnCompletionRateChanging(value); + this.SendPropertyChanging(); + this._CompletionRate = value; + this.SendPropertyChanged("CompletionRate"); + this.OnCompletionRateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem_TestRun_MonthReport", Storage="_TestRun_MonthReport", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public TestRun_MonthReport TestRun_MonthReport + { + get + { + return this._TestRun_MonthReport.Entity; + } + set + { + TestRun_MonthReport previousValue = this._TestRun_MonthReport.Entity; + if (((previousValue != value) + || (this._TestRun_MonthReport.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._TestRun_MonthReport.Entity = null; + previousValue.TestRun_MonthReportItem.Remove(this); + } + this._TestRun_MonthReport.Entity = value; + if ((value != null)) + { + value.TestRun_MonthReportItem.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("TestRun_MonthReport"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_MonthReportItem2")] + public partial class TestRun_MonthReportItem2 : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MonthReportItem2Id; + + private string _MonthReportId; + + private string _ReportType; + + private string _TypeName; + + private string _PV; + + private string _EV; + + private string _AC; + + private string _CV; + + private string _SV; + + private string _CPI; + + private string _SPI; + + private System.Nullable _SortIndex; + + private EntityRef _TestRun_MonthReport; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMonthReportItem2IdChanging(string value); + partial void OnMonthReportItem2IdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnReportTypeChanging(string value); + partial void OnReportTypeChanged(); + partial void OnTypeNameChanging(string value); + partial void OnTypeNameChanged(); + partial void OnPVChanging(string value); + partial void OnPVChanged(); + partial void OnEVChanging(string value); + partial void OnEVChanged(); + partial void OnACChanging(string value); + partial void OnACChanged(); + partial void OnCVChanging(string value); + partial void OnCVChanged(); + partial void OnSVChanging(string value); + partial void OnSVChanged(); + partial void OnCPIChanging(string value); + partial void OnCPIChanged(); + partial void OnSPIChanging(string value); + partial void OnSPIChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); + #endregion + + public TestRun_MonthReportItem2() + { + this._TestRun_MonthReport = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportItem2Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MonthReportItem2Id + { + get + { + return this._MonthReportItem2Id; + } + set + { + if ((this._MonthReportItem2Id != value)) + { + this.OnMonthReportItem2IdChanging(value); + this.SendPropertyChanging(); + this._MonthReportItem2Id = value; + this.SendPropertyChanged("MonthReportItem2Id"); + this.OnMonthReportItem2IdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._TestRun_MonthReport.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportType", DbType="NVarChar(50)")] + public string ReportType + { + get + { + return this._ReportType; + } + set + { + if ((this._ReportType != value)) + { + this.OnReportTypeChanging(value); + this.SendPropertyChanging(); + this._ReportType = value; + this.SendPropertyChanged("ReportType"); + this.OnReportTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeName", DbType="NVarChar(50)")] + public string TypeName + { + get + { + return this._TypeName; + } + set + { + if ((this._TypeName != value)) + { + this.OnTypeNameChanging(value); + this.SendPropertyChanging(); + this._TypeName = value; + this.SendPropertyChanged("TypeName"); + this.OnTypeNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PV", DbType="NVarChar(50)")] + public string PV + { + get + { + return this._PV; + } + set + { + if ((this._PV != value)) + { + this.OnPVChanging(value); + this.SendPropertyChanging(); + this._PV = value; + this.SendPropertyChanged("PV"); + this.OnPVChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EV", DbType="NVarChar(50)")] + public string EV + { + get + { + return this._EV; + } + set + { + if ((this._EV != value)) + { + this.OnEVChanging(value); + this.SendPropertyChanging(); + this._EV = value; + this.SendPropertyChanged("EV"); + this.OnEVChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AC", DbType="NVarChar(50)")] + public string AC + { + get + { + return this._AC; + } + set + { + if ((this._AC != value)) + { + this.OnACChanging(value); + this.SendPropertyChanging(); + this._AC = value; + this.SendPropertyChanged("AC"); + this.OnACChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CV", DbType="NVarChar(50)")] + public string CV + { + get + { + return this._CV; + } + set + { + if ((this._CV != value)) + { + this.OnCVChanging(value); + this.SendPropertyChanging(); + this._CV = value; + this.SendPropertyChanged("CV"); + this.OnCVChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SV", DbType="NVarChar(50)")] + public string SV + { + get + { + return this._SV; + } + set + { + if ((this._SV != value)) + { + this.OnSVChanging(value); + this.SendPropertyChanging(); + this._SV = value; + this.SendPropertyChanged("SV"); + this.OnSVChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CPI", DbType="NVarChar(50)")] + public string CPI + { + get + { + return this._CPI; + } + set + { + if ((this._CPI != value)) + { + this.OnCPIChanging(value); + this.SendPropertyChanging(); + this._CPI = value; + this.SendPropertyChanged("CPI"); + this.OnCPIChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SPI", DbType="NVarChar(50)")] + public string SPI + { + get + { + return this._SPI; + } + set + { + if ((this._SPI != value)) + { + this.OnSPIChanging(value); + this.SendPropertyChanging(); + this._SPI = value; + this.SendPropertyChanged("SPI"); + this.OnSPIChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem2_TestRun_MonthReport", Storage="_TestRun_MonthReport", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public TestRun_MonthReport TestRun_MonthReport + { + get + { + return this._TestRun_MonthReport.Entity; + } + set + { + TestRun_MonthReport previousValue = this._TestRun_MonthReport.Entity; + if (((previousValue != value) + || (this._TestRun_MonthReport.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._TestRun_MonthReport.Entity = null; + previousValue.TestRun_MonthReportItem2.Remove(this); + } + this._TestRun_MonthReport.Entity = value; + if ((value != null)) + { + value.TestRun_MonthReportItem2.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("TestRun_MonthReport"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_PersonTrainPlan")] public partial class TestRun_PersonTrainPlan : INotifyPropertyChanging, INotifyPropertyChanged {