diff --git a/DataBase/ConstInitData.sql b/DataBase/ConstInitData.sql index 9e03c871..d2025410 100644 --- a/DataBase/ConstInitData.sql +++ b/DataBase/ConstInitData.sql @@ -1,3 +1,4 @@ + -- 系统环境常量 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId) --月报上报时间 VALUES('E909CD49-9081-443F-8B40-24F098272B3D','MonthReprotDate','10',1,'SysSet') diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-10-bwj.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-10-bwj.sql index f19c9368..d3652eee 100644 --- a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-10-bwj.sql +++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-10-bwj.sql @@ -30,3 +30,51 @@ go values('CCAFE438-A71E-41D9-A727-AC5A5C92D2A8','9EBA628D-E725-4A0B-B765-171F405D0821','保存',4) go + +CREATE TABLE [dbo].[Driver_MeetingMinutes]( + [MeetingMinutesId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [MinutesCode] [nvarchar](50) NULL, + [MeetingType] [nchar](10) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [Statues] [nvarchar](50) NULL, + CONSTRAINT [PK_Driver_MeetingMinutes] PRIMARY KEY CLUSTERED +( + [MeetingMinutesId] 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].[Driver_MeetingMinutes] WITH CHECK ADD CONSTRAINT [FK_Driver_MeetingMinutes_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[Driver_MeetingMinutes] CHECK CONSTRAINT [FK_Driver_MeetingMinutes_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes', @level2type=N'COLUMN',@level2name=N'MeetingMinutesId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes', @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'Driver_MeetingMinutes', @level2type=N'COLUMN',@level2name=N'MinutesCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'类型（1-生产调度会，2-开车周例会，3-开车专题会）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes', @level2type=N'COLUMN',@level2name=N'MeetingType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes', @level2type=N'COLUMN',@level2name=N'Statues' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议纪要表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_MeetingMinutes' +GO + + diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-11-gaofei.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-11-gaofei.sql new file mode 100644 index 00000000..63297c6b --- /dev/null +++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_2024-04-11-gaofei.sql @@ -0,0 +1,183 @@ +--cd C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools +--SqlMetal /views /server:wq /database:SGGLDB_WH /code:C:\Model.cs /namespace:Model + +delete Sys_Menu where MenuId='AC5BC922-FA5E-4141-8458-7DE89434A8E7' +delete Sys_Menu where MenuId='BEAE1E66-5783-489B-A268-F46491AE1257' +delete Sys_Menu where MenuId='D8DF6DDB-3CDD-41C0-B374-1AAE40802B68' +delete Sys_Menu where MenuId='C2E827C4-6E04-4EB6-8E51-B43FCBD3753F' +delete Sys_Menu where MenuId='AF4EEC31-73E9-4F36-BEA7-2A92468F324E' +delete Sys_Menu where MenuId='7400F47B-3F45-4142-B21F-3BECCABBB202' +delete Sys_Menu where MenuId='F2D170C3-6CA5-439D-8CC7-81E4FB906B1F' +delete Sys_Menu where MenuId='A7BBF5F1-F145-43D1-9227-7EC24099BBEC' +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AC5BC922-FA5E-4141-8458-7DE89434A8E7','检查表模板',null,'TestRun/Produce/InspectTemplate.aspx',2,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('BEAE1E66-5783-489B-A268-F46491AE1257','性能考核管理',null,'TestRun/Produce/SubInspectTerm.aspx',3,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('D8DF6DDB-3CDD-41C0-B374-1AAE40802B68','性能考核确认',null,'TestRun/Produce/SubWorkInspect.aspx',4,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('C2E827C4-6E04-4EB6-8E51-B43FCBD3753F','检查表尾项管理',null,'TestRun/Produce/InspectTailTermList.aspx',5,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AF4EEC31-73E9-4F36-BEA7-2A92468F324E','尾项处理',null,'TestRun/Produce/TailTermHandleList.aspx',6,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('7400F47B-3F45-4142-B21F-3BECCABBB202','尾项审核',null,'TestRun/Produce/TailTermApproveList.aspx',7,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('F2D170C3-6CA5-439D-8CC7-81E4FB906B1F','检查表会签',null,'TestRun/Produce/InspectWanderAboutList.aspx',8,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('A7BBF5F1-F145-43D1-9227-7EC24099BBEC','检查表流转全部通过',null,'TestRun/Produce/InspectWanderAboutAllPassList.aspx',9,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1) +go + +--==生产性能考核条件检查模板信息表 +if object_id(N'ProduceRun_WorkInspectTemplate',N'U') is not null +drop table dbo.ProduceRun_WorkInspectTemplate +CREATE TABLE dbo.ProduceRun_WorkInspectTemplate( + WorkInspectId varchar(50) NOT NULL,--主键 + WorkInspectName varchar(500) NULL,--检查事项名称 + Remark nvarchar(150) NULL,--备注 + AddUser varchar(50) NULL,--添加人 + AddTime datetime NULL,--添加日期 + Sort int NULL,--排序 + CONSTRAINT PK_ProduceRun_WorkInspectTemplate PRIMARY KEY CLUSTERED +( + WorkInspectId 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 + +--==生产性能考核条件检查表 +delete ProduceRun_WorkInspectTemplate where WorkInspectId='A95825BD-709E-46DB-AEFD-1E7C9C1BF524' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='55CB964B-A82A-4BBC-BC2D-040E31C7CC36' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='EE35FF88-6E30-4797-AE46-0623B9BD3E81' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='C679A7B8-4244-42E5-96C8-B5A941FF5130' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='30470FF1-0BA2-4DE0-8CDB-DF812C0AC4B8' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='E369582C-25FB-49EF-B3ED-4A7EDF8CA61C' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='2255D8C6-B12D-4035-B56A-11A5815B7C4F' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='015D647D-ECB4-4252-BA9E-C60190D63F0A' +delete ProduceRun_WorkInspectTemplate where WorkInspectId='6CDFE6DD-E113-4A07-B5F4-083343672A9E' +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('A95825BD-709E-46DB-AEFD-1E7C9C1BF524','在规定的负荷条件下暴露出的问题已经解决，各项工艺指标已处于稳定状态。','','',GETDATE(),1) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('55CB964B-A82A-4BBC-BC2D-040E31C7CC36','全厂相关装置处于稳定运行状态。','','',GETDATE(),2) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('EE35FF88-6E30-4797-AE46-0623B9BD3E81','生产考核方案已制定，并经审核批准。','','',GETDATE(),3) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('C679A7B8-4244-42E5-96C8-B5A941FF5130','测试专用工具和仪表齐备，调校合格，处于有效期内。','','',GETDATE(),4) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('30470FF1-0BA2-4DE0-8CDB-DF812C0AC4B8','测试人员的组织、任务已明确、落实。','','',GETDATE(),5) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('E369582C-25FB-49EF-B3ED-4A7EDF8CA61C','测试项目、分析项目、分析方法已确定。','','',GETDATE(),6) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('2255D8C6-B12D-4035-B56A-11A5815B7C4F','原料、燃料、化学药品等物质数量、规格、质量符合设计文件的要求。','','',GETDATE(),7) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('015D647D-ECB4-4252-BA9E-C60190D63F0A','水、电、气（汽）、原料、燃料、化学药品等确保连续稳定供应。','','',GETDATE(),8) +INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) +VALUES('6CDFE6DD-E113-4A07-B5F4-083343672A9E','自控仪表、报警和联锁装置已投入稳定运行。','','',GETDATE(),9) +go + +--==工作包检查表 +if object_id(N'ProduceRun_SubInspectTerm',N'U') is not null +drop table dbo.ProduceRun_SubInspectTerm +CREATE TABLE dbo.ProduceRun_SubInspectTerm( + SubInspectId varchar(50) NOT NULL,--主键 + ProjectId varchar(50) NULL,--项目主键 + Contractor varchar(50) null,--承包商 + Owner varchar(50) null,--业主 + ProcessPatent varchar(50) null,--工艺专利商 + ContractorIsAllPass int NULL,--承包商是否通过0/null:未通过 1:通过 + OwnerIsAllPass int NULL,--业主是否通过0/null:未通过 1:通过 + ProcessPatentIsAllPass int NULL,--工艺专利商是否通过0/null:未通过 1:通过 + ContractorAllPassData datetime null,--承包商通过日期 + OwnerAllPassData datetime null,--业主通过日期 + ProcessPatentAllPassData datetime null,--工艺专利商通过日期 + InspectionIsAllPass int NULL,--检查结果0/null:未通过 1:通过 + WanderIsComplete int null,--检查表流转是否全部通过0:未通过1:通过 + WanderCompleteData datetime null,--检查表流转完成日期 + IsUnifyWanderAbout int null,--是否统一流转0:否1:是 + UnifyWanderAboutData datetime null,--统一流转时间 + UnifyWanderAboutOpinion varchar(max) null,--统一流转备注 + InspectIsClose int null,--任务单是否关闭0:未关闭1:已关闭 + InspectCloseData datetime null,--任务单关闭日期 + InspectTime datetime NULL,--检查时间 + AddUser varchar(50) NULL,--添加人 + AddTime datetime NULL,--添加日期 + CONSTRAINT PK_ProduceRun_SubInspectTerm PRIMARY KEY CLUSTERED +( + SubInspectId 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 + +--==工作包检查项表 +if object_id(N'ProduceRun_SubInspectTermItem',N'U') is not null +drop table dbo.ProduceRun_SubInspectTermItem +CREATE TABLE dbo.ProduceRun_SubInspectTermItem( + TermItemId varchar(50) NOT NULL,--主键 + ProjectId varchar(50) NULL,--项目主键 + SubInspectId varchar(50) NULL,--检查表主键 + GroupName varchar(50) NULL,--分组名称 + WorkInspectId varchar(50) NOT NULL,--工作包模板项主键 + WorkInspectName varchar(500) NULL,--检查事项名称 + InspectedUser varchar(50) NULL,--检查人主键 + InspectionResults int NULL,--检查结果0:未通过 1:通过 + InspectionIllustrate varchar(200) NULL,--检查说明 + Contractor varchar(50) null,--承包商 + Owner varchar(50) null,--业主 + ProcessPatent varchar(50) null,--工艺专利商 + ContractorIsPass int NULL,--承包商是否通过0/null:未通过 1:通过 + OwnerIsPass int NULL,--业主是否通过0/null:未通过 1:通过 + ProcessPatentIsPass int NULL,--工艺专利商是否通过0/null:未通过 1:通过 + ContractorRemark varchar(1000) NULL,--承包商备注 + OwnerRemark varchar(1000) NULL,--业主备注 + ProcessPatentRemark varchar(1000) NULL,--工艺专利商备注 + Remark varchar(200) NULL,--备注 + AddUser varchar(50) NULL,--添加人 + AddTime datetime NULL,--添加日期 + Sort int NULL,--排序 + CONSTRAINT PK_ProduceRun_SubInspectTermItem PRIMARY KEY CLUSTERED +( + TermItemId 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 + +--==检查表尾项管理 +if object_id(N'ProduceRun_InspectTailTerm',N'U') is not null +drop table dbo.ProduceRun_InspectTailTerm +CREATE TABLE dbo.ProduceRun_InspectTailTerm( + TailTermId varchar(50) NOT NULL,--主键 + ProjectId varchar(50) NULL,--项目主键 + ProjectName varchar(50) NULL,--项目名称 + TailTermCode varchar(50) NULL,--巡检编号 + ConstructionUnit varchar(50) NULL,--施工单位 + SubInspectId varchar(50) NULL,--工作包检查表主键 + TermItemId varchar(50) NULL,--检查项主键 + QuestionDesc varchar(max) NULL,--问题描述 + RectifyOpinion varchar(max) NULL,--整改意见 + RectifyTime datetime NULL,--尾项提出时间 + InspectUser varchar(50) NULL,--检查人 + HandleUser varchar(50) NULL,--处理人 + ApproveUser varchar(50) NULL,--审核人 + AdjustCompleteTime datetime NULL,--要求整改完成时间 + ApproveState int NULL,--0:待提交处理1:待处理2:处理退回3:审核退回4:待审核5:审核通过 + AddUser varchar(50) NULL,--添加人 + AddTime datetime NULL,--添加日期 + CONSTRAINT PK_ProduceRun_InspectTailTerm PRIMARY KEY CLUSTERED +( + TailTermId 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 + +--==检查项处理/审核记录 +if object_id(N'ProduceRun_InspectTermApproveRecords',N'U') is not null +drop table dbo.ProduceRun_InspectTermApproveRecords +CREATE TABLE dbo.ProduceRun_InspectTermApproveRecords( + InspectTermId varchar(50) NOT NULL,--主键 + ProjectId varchar(50) NULL,--项目主键 + TermItemId varchar(50) NULL,--检查项主键 + TailTermId varchar(50) NULL,--尾项主键 + ApproveOpinion varchar(max) NULL,--审核意见 + ApproveTime datetime NULL,--操作时间 + ApproveUser varchar(50) NULL,--操作人 + ApproveType int NULL,--记录类型0:处理记录1:审核记录 + ApproveState int NULL,--0:退回1:通过 + AddUser varchar(50) NULL,--添加人 + AddTime datetime NULL,--添加日期 + CONSTRAINT PK_ProduceRun_InspectTermApproveRecords PRIMARY KEY CLUSTERED +( + InspectTermId 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 \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx index 314e0c4a..41ab701a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx @@ -60,7 +60,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs index 658e3f9d..8813804e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs @@ -220,12 +220,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive dataDistribution.DataDistributionId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataDistribution)); this.hdAttachUrl.Text = dataDistribution.DataDistributionId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataDistribution.DataDistributionId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} dataDistribution.CompileMan = this.CurrUser.UserId; dataDistribution.CompileDate = DateTime.Now; dataDistribution.Status = BLL.Const.Comprehensive_Compile; @@ -246,12 +240,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { dataDistribution.Status = BLL.Const.Comprehensive_Compile; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataDistributionId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} BLL.DataDistributionService.UpdateDataDistribution(dataDistribution); } PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); @@ -303,12 +291,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive dataDistribution.DataDistributionId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataDistribution)); this.hdAttachUrl.Text = dataDistribution.DataDistributionId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataDistribution.DataDistributionId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } dataDistribution.CompileMan = this.CurrUser.UserId; dataDistribution.CompileDate = DateTime.Now; dataDistribution.Status = BLL.Const.Comprehensive_Audit; @@ -317,12 +299,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { dataDistribution.DataDistributionId = this.DataDistributionId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataDistributionId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } var model = Funs.DB.Comprehensive_DataDistribution.Where(u => u.DataDistributionId == this.DataDistributionId).FirstOrDefault(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx index 360e9a3b..b9e3c50a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx @@ -61,7 +61,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs index 6d5b6de4..417a86dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs @@ -208,12 +208,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive dataReceiving.DataReceivingId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceiving)); this.hdAttachUrl.Text = dataReceiving.DataReceivingId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceiving.DataReceivingId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} dataReceiving.CompileMan = this.CurrUser.UserId; dataReceiving.CompileDate = DateTime.Now; dataReceiving.Status = BLL.Const.Comprehensive_Audit; @@ -222,12 +216,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { dataReceiving.DataReceivingId = this.DataReceivingId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} dataReceiving.Status = BLL.Const.Comprehensive_Audit; var model = Funs.DB.Comprehensive_DataReceiving.Where(u => u.DataReceivingId == this.DataReceivingId).FirstOrDefault(); @@ -366,12 +354,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive dataReceiving.DataReceivingId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceiving)); this.hdAttachUrl.Text = dataReceiving.DataReceivingId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceiving.DataReceivingId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } dataReceiving.CompileMan = this.CurrUser.UserId; dataReceiving.CompileDate = DateTime.Now; dataReceiving.Status = Const.Comprehensive_Compile; @@ -385,12 +367,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { dataReceiving.Status = model.Status; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } BLL.DataReceivingService.UpdateDataReceiving(dataReceiving); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx index a6bd50d0..70b4acc8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx @@ -52,7 +52,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index d4aad9b3..26ea6252 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -231,13 +231,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId; } - - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} designChangeOrder.CompileMan = this.CurrUser.UserId; designChangeOrder.CompileDate = DateTime.Now; @@ -247,12 +240,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault(); if (model != null) { @@ -325,13 +312,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId; } - - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } designChangeOrder.CompileMan = this.CurrUser.UserId; designChangeOrder.CompileDate = DateTime.Now; designChangeOrder.Status = BLL.Const.Comprehensive_Audit; @@ -340,12 +320,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designChangeOrder.DesignChangeOrderId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } var oldDesignChangeOrder = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index 2921ee50..592da456 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -226,12 +226,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = designDetails.DesignDetailsId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDetails.DesignDetailsId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} + designDetails.CompileMan = this.CurrUser.UserId; designDetails.CompileDate = DateTime.Now; designDetails.Status = BLL.Const.Comprehensive_Compile; @@ -240,12 +235,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { designDetails.DesignDetailsId = this.DesignDetailsId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDetailsId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault(); if (model != null) { @@ -317,12 +306,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = designDetails.DesignDetailsId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDetails.DesignDetailsId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } designDetails.CompileMan = this.CurrUser.UserId; designDetails.CompileDate = DateTime.Now; designDetails.Status = BLL.Const.Comprehensive_Audit; @@ -331,12 +314,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { designDetails.DesignDetailsId = this.DesignDetailsId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDetailsId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } + var oldDesignDetails = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault(); if (oldDesignDetails == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx index 0b9f4b4d..97230392 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx @@ -62,7 +62,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index 17626a42..638aca3c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -215,12 +215,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (!string.IsNullOrEmpty(this.DesignDrawingsId)) { designDrawings.DesignDrawingsId = this.DesignDrawingsId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDrawingsId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault(); if (model != null) @@ -242,12 +236,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = designDrawings.DesignDrawingsId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} designDrawings.Status = BLL.Const.Comprehensive_Compile; BLL.DesignDrawingsService.AddDesignDrawings(designDrawings); } @@ -306,12 +294,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (!string.IsNullOrEmpty(this.DesignDrawingsId)) { designDrawings.DesignDrawingsId = this.DesignDrawingsId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DesignDrawingsId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); var oldDesignDrawings = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault(); if (oldDesignDrawings == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 @@ -359,12 +341,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = designDrawings.DesignDrawingsId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } designDrawings.Status = BLL.Const.Comprehensive_Audit; BLL.DesignDrawingsService.AddDesignDrawings(designDrawings); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 9bbdad44..25506189 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -73,7 +73,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index 934304f7..b882db8e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -285,24 +285,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.CompileMan = this.CurrUser.UserId; newInspectionEquipment.CompileDate = DateTime.Now; newInspectionEquipment.Status = BLL.Const.Comprehensive_Compile; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment); } else { newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault(); if (oldInspectionEquipment == null) { @@ -320,40 +308,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } - //else - //{ - // newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId; - // var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId); - // if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - // { - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - // } - // BLL.InspectionEquipmentService.UpdateInspectionEquipment(newInspectionEquipment); - //} - - - //#region 瀹℃牳璁板綍 - - //var approve = InspectionEquipmentApproveService.GetApproveByApproveMan(newInspectionEquipment.InspectionEquipmentId, CurrUser.UserId); - //if (approve == null) //鏈坊鍔犲鏍镐俊鎭椂 - //{ - // approve = new Model.Comprehensive_InspectionEquipmentApprove(); - // approve.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId; - // approve.ApproveMan = this.CurrUser.UserId; - // approve.ApproveType = Const.Comprehensive_Compile; - // approve.ApproveDate = DateTime.Now; - // InspectionEquipmentApproveService.EditApprove(approve); //鏂板缂栧埗璁板綍 - //} - //else - //{ - // approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - // approve.ApproveIdea = txtidea.Text.Trim(); - //} - - //#endregion - - + ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); @@ -413,23 +368,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit; newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment); } else { - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId; var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault(); if (oldInspectionEquipment == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx index d78f12e8..1198ad9f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx @@ -82,7 +82,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index c102c56f..690b7c73 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -229,12 +229,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = inspectionMachone.InspectionMachineId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionMachone.InspectionMachineId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} inspectionMachone.CompileMan = this.CurrUser.UserId; inspectionMachone.CompileDate = DateTime.Now; inspectionMachone.Status = BLL.Const.Comprehensive_Compile; @@ -243,12 +237,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { inspectionMachone.InspectionMachineId = this.InspectionMachineId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionMachineId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault(); if (model != null) @@ -309,12 +297,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = inspectionMachone.InspectionMachineId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionMachone.InspectionMachineId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } + inspectionMachone.CompileMan = this.CurrUser.UserId; inspectionMachone.CompileDate = DateTime.Now; inspectionMachone.Status = BLL.Const.Comprehensive_Audit; @@ -323,12 +306,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { inspectionMachone.InspectionMachineId = this.InspectionMachineId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionMachineId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } + //BLL.InspectionMachineService.UpdateInspectionMachine(inspectionMachone); var oldInspectionMachine = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx index 1a3dfea6..5e08b175 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx @@ -79,7 +79,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index 8c2a2432..ad5dcbeb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -333,12 +333,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = inspectionPerson.InspectionPersonId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionPerson.InspectionPersonId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} // 浜哄憳鎶ラ獙 BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson); @@ -363,12 +357,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { inspectionPerson.Status = BLL.Const.Comprehensive_Compile; inspectionPerson.InspectionPersonId = this.InspectionPersonId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionPersonId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault(); if (model != null) { @@ -523,12 +511,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = inspectionPerson.InspectionPersonId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionPerson.InspectionPersonId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } inspectionPerson.Status = BLL.Const.Comprehensive_Audit; // 浜哄憳鎶ラ獙 BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson); @@ -551,12 +533,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { inspectionPerson.InspectionPersonId = this.InspectionPersonId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionPersonId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } // BLL.InspectionPersonService.UpdateInspectionPerson(inspectionPerson); var oldInspectionPerson = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault(); if (oldInspectionPerson == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index 1a44d148..c75baf46 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -83,7 +83,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index dc99fa6e..5abfa10e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -272,12 +272,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); this.hdAttachUrl.Text = nCRManagement.NCRManagementId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} nCRManagement.CompileMan = this.CurrUser.UserId; nCRManagement.Status = BLL.Const.Comprehensive_Compile; BLL.NCRManagementService.AddNCRManagement(nCRManagement); @@ -285,12 +279,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { nCRManagement.NCRManagementId = this.NCRManagementId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault(); if (model != null) { @@ -391,12 +379,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); this.hdAttachUrl.Text = nCRManagement.NCRManagementId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } nCRManagement.CompileMan = this.CurrUser.UserId; nCRManagement.Status = BLL.Const.Comprehensive_Audit; BLL.NCRManagementService.AddNCRManagement(nCRManagement); @@ -404,12 +386,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { nCRManagement.NCRManagementId = this.NCRManagementId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } //BLL.NCRManagementService.UpdateNCRManagement(nCRManagement); var oldNCRManagement = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault(); if (oldNCRManagement == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx index 4439355a..99ee012a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx @@ -42,7 +42,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index b63ad6b8..27a642a2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -213,12 +213,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive pressurePipe.PressurePipeId = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipe)); this.hdAttachUrl.Text = pressurePipe.PressurePipeId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.PressurePipeId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} pressurePipe.CompileMan = this.CurrUser.UserId; pressurePipe.Status = BLL.Const.Comprehensive_Compile; @@ -227,12 +221,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { pressurePipe.PressurePipeId = this.PressurePipeId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.PressurePipeId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault(); if (model != null) @@ -303,12 +291,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive pressurePipe.PressurePipeId = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipe)); this.hdAttachUrl.Text = pressurePipe.PressurePipeId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.PressurePipeId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } pressurePipe.CompileMan = this.CurrUser.UserId; pressurePipe.Status = BLL.Const.Comprehensive_Audit; BLL.PressurePipeService.AddPressurePipe(pressurePipe); @@ -316,12 +298,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { pressurePipe.PressurePipeId = this.PressurePipeId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.PressurePipeId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } // BLL.PressurePipeService.UpdatePressurePipe(pressurePipe); var oldPressurePipe = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault(); if (oldPressurePipe == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx index c90a35b8..e9093686 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx @@ -51,7 +51,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs index 9dc30816..2499b1ef 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs @@ -193,12 +193,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive pressurePipe.QualityAccidentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccident)); this.hdAttachUrl.Text = pressurePipe.QualityAccidentId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.QualityAccidentId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} pressurePipe.CompileMan = this.CurrUser.UserId; pressurePipe.CompileDate = DateTime.Now; pressurePipe.Status = BLL.Const.Comprehensive_Compile; @@ -207,12 +201,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { pressurePipe.QualityAccidentId = this.QualityAccidentId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.QualityAccidentId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault(); if (model != null) @@ -278,12 +266,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive pressurePipe.QualityAccidentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccident)); this.hdAttachUrl.Text = pressurePipe.QualityAccidentId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == pressurePipe.QualityAccidentId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } pressurePipe.CompileMan = this.CurrUser.UserId; pressurePipe.CompileDate = DateTime.Now; pressurePipe.Status = BLL.Const.Comprehensive_Audit; @@ -292,12 +274,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { pressurePipe.QualityAccidentId = this.QualityAccidentId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.QualityAccidentId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } // BLL.QualityAccidentService.UpdateQualityAccident(pressurePipe); var oldQualityAccident = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs index 85226e42..5dff7a25 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs @@ -251,12 +251,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (!string.IsNullOrEmpty(this.Id)) { designDrawings.Id = this.Id; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault(); if (model != null) @@ -278,12 +272,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = designDrawings.Id; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} designDrawings.Status = BLL.Const.Comprehensive_Compile; BLL.ReviewDrawingsService.Insert(designDrawings); } @@ -337,12 +325,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (!string.IsNullOrEmpty(this.Id)) { designDrawings.Id = this.Id; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); var oldDesignDrawings = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault(); if (oldDesignDrawings == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 @@ -390,12 +372,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = designDrawings.Id; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} designDrawings.Status = BLL.Const.Comprehensive_Audit; BLL.ReviewDrawingsService.Insert(designDrawings); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx index 5e932d59..eb016042 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx @@ -57,7 +57,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs index 287c04c8..6695d741 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs @@ -211,12 +211,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive siteVisaManagement.VisaId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement)); this.hdAttachUrl.Text = siteVisaManagement.VisaId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == siteVisaManagement.VisaId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} siteVisaManagement.CompileMan = this.CurrUser.UserId; siteVisaManagement.Status = BLL.Const.Comprehensive_Compile; BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement); @@ -224,12 +218,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { siteVisaManagement.VisaId = this.VisaId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.VisaId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault(); if (model != null) { @@ -289,12 +277,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive siteVisaManagement.VisaId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement)); this.hdAttachUrl.Text = siteVisaManagement.VisaId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == siteVisaManagement.VisaId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } siteVisaManagement.CompileMan = this.CurrUser.UserId; siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement); @@ -302,12 +284,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { siteVisaManagement.VisaId = this.VisaId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.VisaId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } // BLL.SiteVisaManagementService.UpdateSiteVisaManagement(siteVisaManagement); var oldSiteVisaManagement = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx index 8893694e..115203ae 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx @@ -35,7 +35,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index 89a7cb5a..3eb296ea 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -211,12 +211,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive specialEquipment.SpecialEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment)); this.hdAttachUrl.Text = specialEquipment.SpecialEquipmentId; } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == specialEquipment.SpecialEquipmentId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} specialEquipment.CompileMan = this.CurrUser.UserId; specialEquipment.Status = BLL.Const.Comprehensive_Compile; BLL.SpecialEquipmentServices.AddEquipment(specialEquipment); @@ -224,12 +218,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { specialEquipment.SpecialEquipmentId = this.SpecialEquipmentId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.SpecialEquipmentId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - // return; - //} var model = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault(); if (model != null) { @@ -296,12 +284,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive specialEquipment.SpecialEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment)); this.hdAttachUrl.Text = specialEquipment.SpecialEquipmentId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == specialEquipment.SpecialEquipmentId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } specialEquipment.CompileMan = this.CurrUser.UserId; specialEquipment.Status = BLL.Const.Comprehensive_Audit; BLL.SpecialEquipmentServices.AddEquipment(specialEquipment); @@ -309,12 +291,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { specialEquipment.SpecialEquipmentId = this.SpecialEquipmentId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.SpecialEquipmentId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); - return; - } // BLL.SpecialEquipmentServices.UpdateEquipment(specialEquipment); var oldSpecialEquipment = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault(); if (oldSpecialEquipment == null) //鏁版嵁搴撴病鏈夎褰 鐩存帴鐐规彁浜 褰撳墠鐘舵佷负 瀹℃牳鐘舵 diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index 1b1e5e13..7f16cf78 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -81,7 +81,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl Alert.ShowInTop("璇峰厛閫夋嫨涓撲笟锛", MessageBoxIcon.Warning); return; } - + if (this.Grid1.Rows.Count == 0) + { + Alert.ShowInTop("璇烽夋嫨鍏辨鍐呭锛", MessageBoxIcon.Warning); + return; + } Model.ProcessControl_InspectionManagement inspectionManagement = new Model.ProcessControl_InspectionManagement(); inspectionManagement.ProjectId = this.CurrUser.LoginProjectId; diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 26f4b6d6..3bace61e 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1872,6 +1872,20 @@ + + + + + + + + + + + + + + @@ -16724,6 +16738,104 @@ TestRunReportEdit.aspx + + InspectTailTermEdit.aspx + ASPXCodeBehind + + + InspectTailTermEdit.aspx + + + InspectTailTermList.aspx + ASPXCodeBehind + + + InspectTailTermList.aspx + + + InspectTemplate.aspx + ASPXCodeBehind + + + InspectTemplate.aspx + + + InspectTemplateEdit.aspx + ASPXCodeBehind + + + InspectTemplateEdit.aspx + + + InspectWanderAboutAllPass.aspx + ASPXCodeBehind + + + InspectWanderAboutAllPass.aspx + + + InspectWanderAboutAllPassList.aspx + ASPXCodeBehind + + + InspectWanderAboutAllPassList.aspx + + + InspectWanderAboutConfirm.aspx + ASPXCodeBehind + + + InspectWanderAboutConfirm.aspx + + + InspectWanderAboutList.aspx + ASPXCodeBehind + + + InspectWanderAboutList.aspx + + + SubInspectTerm.aspx + ASPXCodeBehind + + + SubInspectTerm.aspx + + + SubWorkInspect.aspx + ASPXCodeBehind + + + SubWorkInspect.aspx + + + TailTermApprove.aspx + ASPXCodeBehind + + + TailTermApprove.aspx + + + TailTermApproveList.aspx + ASPXCodeBehind + + + TailTermApproveList.aspx + + + TailTermHandle.aspx + ASPXCodeBehind + + + TailTermHandle.aspx + + + TailTermHandleList.aspx + ASPXCodeBehind + + + TailTermHandleList.aspx + FourDecisionSchedule.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx new file mode 100644 index 00000000..f922822d --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx @@ -0,0 +1,181 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectTailTermEdit" %> + + + + + + 璐ㄩ噺宸℃ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx.cs new file mode 100644 index 00000000..c5165940 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx.cs @@ -0,0 +1,393 @@ +锘縰sing BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class InspectTailTermEdit : PageBase + { + /// + /// 妫鏌ヨ〃灏鹃」涓婚敭 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 妫鏌ラ」涓婚敭 + /// + public string TermItemId + { + get { return (string)ViewState["TermItemId"]; } + set { ViewState["TermItemId"] = value; } + } + + /// + /// 鏄惁鏌ョ湅 + /// + public bool IsView + { + get { return (bool)ViewState["IsView"]; } + set { ViewState["IsView"] = value; } + } + + /// + /// 闂鍥剧墖鏄惁鍙紪杈 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.TermItemId = Request["TermItemId"]; + //鏄惁鏌ョ湅 + this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); + //鏁版嵁缁戝畾 + PageInit(); + //澶勭悊鍜屽鎵规剰瑙佺粦瀹 + gvRecordBrid(); + //鍒ゆ柇鏄惁鏌ョ湅 + if (IsView) + { + btnSave.Hidden = true; + btnSubmit.Hidden = true; + QuestionEditImg = -1; + txtTailTermCode.Enabled = false; + ddlConstructionUnit.Enabled = false; + ddlTermItemId.Enabled = false; + txtQuestionDesc.Enabled = false; + txtRectifyOpinion.Enabled = false; + ddlApproveUser.Enabled = false; + ddlHandleUser.Enabled = false; + } + } + } + + + /// + /// 榛樿缁戝畾 + /// + public void PageInit() + { + QuestionEditImg = 0; + //鏂藉伐鍗曚綅 + UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + //妫鏌ヤ汉缁戝畾 + var userList = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); + var users = userList.ToList(); + if (addUserList.Count() > 0) + { + users.AddRange(addUserList); + } + //妫鏌ヤ汉鍜屽鏍镐汉 + if (users.Count() > 0) + { + //澶勭悊浜 + ddlHandleUser.DataTextField = "UserName"; + ddlHandleUser.DataValueField = "UserId"; + ddlHandleUser.DataSource = users; + ddlHandleUser.DataBind(); + ddlHandleUser.SelectedValue = this.CurrUser.UserId; + //瀹℃牳浜 + ddlApproveUser.DataTextField = "UserName"; + ddlApproveUser.DataValueField = "UserId"; + ddlApproveUser.DataSource = users; + ddlApproveUser.DataBind(); + ddlApproveUser.SelectedValue = this.CurrUser.UserId; + } + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model != null) + { + //椤圭洰鍚嶇О + txtProjectName.Text = model.ProjectName; + //宸℃缂栧彿 + txtTailTermCode.Text = model.TailTermCode; + //鏂藉伐鍗曚綅 + ddlConstructionUnit.SelectedValue = model.ConstructionUnit; + //鎻愬嚭浜 + var inspectModel = users.FirstOrDefault(x => x.UserId == model.InspectUser); + if (inspectModel != null) + { + lblInspectUser.Text = inspectModel.UserName; + hidInspectUserId.Text = inspectModel.UserId; + } + //缁戝畾妫鏌ラ」 + var list = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.InspectedUser == this.CurrUser.UserId).ToList(); + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + //妫鏌ラ」 + ddlTermItemId.SelectedValue = model.TermItemId; + //闂鎻忚堪 + txtQuestionDesc.Text = model.QuestionDesc; + //鏁存敼鎰忚 + txtRectifyOpinion.Text = model.RectifyOpinion; + //鎻愬嚭鏃堕棿 + lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd") : string.Empty; + //澶勭悊浜 + ddlHandleUser.SelectedValue = model.HandleUser; + //瀹℃牳浜 + ddlApproveUser.SelectedValue = model.ApproveUser; + //鏁存敼瀹屾垚鏃ユ湡 + txtAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd") : string.Empty; + if (model.ApproveState > 1) + { + QuestionEditImg = -1; + } + } + else + { + this.TailTermId = Guid.NewGuid().ToString(); + var projectModel = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == this.CurrUser.LoginProjectId); + if (projectModel != null) + { + txtProjectName.Text = projectModel.ProjectName; + string code = projectModel.ProjectCode + "-06-CM03-XJ-"; + txtTailTermCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.ProduceRun_InspectTailTerm", "TailTermCode", code); + } + if (!string.IsNullOrWhiteSpace(this.TermItemId)) + { + var itemTerm = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.InspectedUser == this.CurrUser.UserId && x.TermItemId == this.TermItemId); + if (itemTerm != null) + { + var list = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId && (x.InspectionResults == 0 || x.TermItemId == this.TermItemId)); + ddlTermItemId.Items.Clear(); + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + else + { + ddlTermItemId.Items.Insert(0, new ListItem("==鏃犳暟鎹==", "")); + } + + //妫鏌ラ」 + ddlTermItemId.SelectedValue = itemTerm.TermItemId; + //鎻愬嚭浜 + var inspectModel = users.FirstOrDefault(x => x.UserId == itemTerm.InspectedUser); + if (inspectModel != null) + { + lblInspectUser.Text = inspectModel.UserName; + hidInspectUserId.Text = inspectModel.UserId; + } + //鎻愬嚭鏃堕棿 + lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); + } + } + } + } + + /// + /// 澶勭悊鍜屽鎵规剰瑙佺粦瀹 + /// + public void gvRecordBrid() + { + string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '澶勭悊閫鍥' when 1 then '澶勭悊閫氳繃' else '' end) else (case a.ApproveState when 0 then '瀹℃壒閫鍥' when 1 then '瀹℃壒閫氳繃' else '' end) end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from ProduceRun_InspectTermApproveRecords as a inner join ProduceRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join ProduceRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@TailTermId", this.TailTermId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + //澶勭悊鎰忚 + var handleTb = tb.AsEnumerable().Where(row => row.Field("ApproveType") == 0); + gvHandle.DataSource = handleTb; + gvHandle.DataBind(); + //瀹℃壒鎰忚 + var approveTb = tb.AsEnumerable().Where(row => row.Field("ApproveType") == 1); + gvApprove.DataSource = approveTb; + gvApprove.DataBind(); + } + + #region 鎸夐挳 + + /// + /// 淇濆瓨 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("璇烽夋嫨鏂藉伐鍗曚綅!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("璇烽夋嫨妫鏌ラ」!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue)) + { + ShowNotify("璇烽夋嫨澶勭悊浜!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("璇烽夋嫨瀹℃牳浜!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new ProduceRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(lblRectifyTime.Text); + model.InspectUser = hidInspectUserId.Text; + model.HandleUser = ddlHandleUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text); + model.ApproveState = 0; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + if (isAdd) + { + Funs.DB.ProduceRun_InspectTailTerm.InsertOnSubmit(model); + } + //鍒ゆ柇灏鹃」鏄惁淇濆瓨 + var itemModel = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId && x.InspectedUser == this.CurrUser.UserId); + if (itemModel != null) itemModel.InspectionResults = 0; + Funs.DB.SubmitChanges(); + ShowNotify("鎿嶄綔鎴愬姛!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 淇濆瓨骞舵彁浜 + /// + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("璇烽夋嫨鏂藉伐鍗曚綅!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("璇烽夋嫨妫鏌ラ」!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue)) + { + ShowNotify("璇烽夋嫨澶勭悊浜!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("璇烽夋嫨瀹℃牳浜!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new ProduceRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(lblRectifyTime.Text); + model.InspectUser = hidInspectUserId.Text; + model.HandleUser = ddlHandleUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text); + model.ApproveState = 1; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + if (isAdd) + { + Funs.DB.ProduceRun_InspectTailTerm.InsertOnSubmit(model); + } + //鍒ゆ柇灏鹃」鏄惁淇濆瓨 + var itemModel = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId && x.InspectedUser == this.CurrUser.UserId); + if (itemModel != null) itemModel.InspectionResults = 0; + Funs.DB.SubmitChanges(); + ShowNotify("鎿嶄綔鎴愬姛!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 闂鍥剧墖 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + #endregion + + #region 浜嬩欢 + + /// + /// 妫鏌ラ」 + /// + protected void ddlTermItemId_SelectedIndexChanged(object sender, EventArgs e) + { + var itemUserTerm = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == ddlTermItemId.SelectedValue); + if (itemUserTerm != null) + { + //鎻愬嚭浜 + var inspectModel = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == itemUserTerm.InspectedUser); + if (inspectModel != null) + { + lblInspectUser.Text = inspectModel.UserName; + hidInspectUserId.Text = inspectModel.UserId; + } + //鎻愬嚭鏃堕棿 + lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); + } + } + + /// + /// 鍏抽棴 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx.designer.cs new file mode 100644 index 00000000..e1b5a405 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermEdit.aspx.designer.cs @@ -0,0 +1,269 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectTailTermEdit + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtProjectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtTailTermCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtTailTermCode; + + /// + /// ddlConstructionUnit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlConstructionUnit; + + /// + /// ddlTermItemId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlTermItemId; + + /// + /// txtQuestionDesc 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtQuestionDesc; + + /// + /// txtRectifyOpinion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtRectifyOpinion; + + /// + /// lblInspectUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblRectifyTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblRectifyTime; + + /// + /// hidInspectUserId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hidInspectUserId; + + /// + /// ddlHandleUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlHandleUser; + + /// + /// ddlApproveUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlApproveUser; + + /// + /// txtAdjustCompleteTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtAdjustCompleteTime; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// plApprove2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvHandle 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid gvHandle; + + /// + /// plApprove3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.FormRow plApprove3; + + /// + /// gvApprove 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid gvApprove; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnSubmit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// WindowAtt 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx new file mode 100644 index 00000000..72f26b14 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx @@ -0,0 +1,179 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectTailTermList" %> + + + + + + + + + 妫鏌ヨ〃灏鹃」绠＄悊 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx.cs new file mode 100644 index 00000000..6ee1cecd --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx.cs @@ -0,0 +1,314 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class InspectTailTermList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + BindGrid(); + } + } + + #region 缁戝畾鏁版嵁 + + /// + /// 鏁版嵁缁戝畾 + /// + public void BindGrid() + { + string strSql = @"select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '寰呮彁浜ゅ鐞' when 1 then '寰呭鐞' when 2 then '澶勭悊閫鍥' when 3 then '瀹℃牳閫鍥' when 4 then '寰呭鏍' when 5 then '瀹℃牳閫氳繃' else '' end) as ApproveStateName,a.AddTime,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from ProduceRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join ProduceRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where 1=1 and a.ProjectId=@projectid and a.InspectUser=@InspectUser"; + + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@InspectUser", this.CurrUser.UserId)); + //瀹℃牳鐘舵 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and a.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + //寮濮嬫椂闂 + if (!string.IsNullOrWhiteSpace(txtStartTime.Text)) + { + strSql += $" and a.RectifyTime>='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 00:00:00'"; + } + //缁撴潫鏃堕棿 + if (!string.IsNullOrWhiteSpace(txtEndTime.Text)) + { + strSql += $" and a.RectifyTime<='{DateTime.Parse(txtEndTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'"; + } + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 鍒嗛〉 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鍙屽嚮浜嬩欢 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(null, null); + } + + /// + /// 鍒嗛〉涓嬫媺妗 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 琛屾暟鎹鐞嗕簨浠 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + DataRowView row = e.DataItem as DataRowView; + + // 鍏ュ骞翠唤 + int diffDay = Convert.ToInt32(row["AdjustDiffDay"]); + TemplateField AdjustDiffDay = Grid1.FindColumn("AdjustDiffDay") as TemplateField; + int approveState = int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()); + if (approveState != 5) + { + if (diffDay > 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color1"; + } + else if (diffDay == 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color2"; + } + else if (diffDay < 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color3"; + } + } + } + + #endregion + + #region 鎸夐挳 + + /// + /// 淇敼 + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + + var passLs = new List() { 0, 2 }; + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (!passLs.Contains(model.ApproveState.Value)) + { + Alert.ShowInTop("鍙彲缂栬緫鈥滃緟鎻愪氦澶勭悊鈥濆拰鈥滃鐞嗛鍥炩濈殑璁板綍锛", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}", Grid1.SelectedRowID, "缂栬緫 - "))); + } + + /// + /// 缂栬緫 + /// + protected void btnModify_Click(object sender, EventArgs e) + { + btnMenuModify_Click(null, null); + } + + /// + /// 鏂板 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId=", "鏂板 - "))); + } + + /// + /// 鏌ョ湅 + /// + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?IsView=true&TailTermId={0}", Grid1.SelectedRowID, "鏌ョ湅 - "))); + } + + /// + /// 鍒犻櫎 + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 0) + { + Alert.ShowInTop("鍙彲鍒犻櫎寰呮彁浜ょ殑璁板綍锛", MessageBoxIcon.Warning); + return; + } + + Funs.DB.ProduceRun_InspectTailTerm.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("鍒犻櫎鎴愬姛锛", MessageBoxIcon.Success); + } + } + + /// + /// 鏌ヨ + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 寮规鍏抽棴 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 鎻愪氦澶勭悊 + /// + protected void btnSubmitReview_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + var passLs = new List() { 0, 2 }; + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + //0:寰呮彁浜ゅ鐞1:寰呭鐞2:澶勭悊閫鍥3:瀹℃牳閫鍥4:寰呭鏍5:瀹℃牳閫氳繃 + if (!passLs.Contains(model.ApproveState.Value)) + { + Alert.ShowInTop("鍙彲鎻愪氦鈥滃緟鎻愪氦澶勭悊鈥濆拰鈥滃鐞嗛鍥炩濈殑璁板綍锛", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 1; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("鎻愪氦鎴愬姛锛", MessageBoxIcon.Success); + } + } + + /// + /// 鎾ゅ洖鎻愪氦 + /// + protected void btnwithdraw_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + //0:寰呮彁浜ゅ鐞1:寰呭鐞2:澶勭悊閫鍥3:瀹℃牳閫鍥4:寰呭鏍5:瀹℃牳閫氳繃 + if (model.ApproveState != 1) + { + Alert.ShowInTop("鍙彲鎾ゅ洖鈥滃緟澶勭悊鈥濈殑璁板綍锛", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 0; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("鎾ゅ洖鎴愬姛锛", MessageBoxIcon.Success); + } + } + + #endregion + + #region 绉佹湁鏂规硶 + + /// + /// 鏄惁閫炬湡杩斿洖 + /// + /// + public string IsOverdue(object diffDayVal, object approveStateVal) + { + var result = string.Empty; + var diffDay = 0; + var approveState = 0; + if (diffDayVal != null) diffDay = int.Parse(diffDayVal.ToString()); + if (approveStateVal != null) approveStateVal = int.Parse(approveStateVal.ToString()); + if (approveState != 5) + { + if (diffDay > 0) + { + result = "鏈炬湡"; + } + else if (diffDay == 0) + { + result = "鍗冲皢閫炬湡"; + } + else if (diffDay < 0) + { + result = "宸查炬湡"; + } + } + else + { + result = "鏁存敼瀹屾瘯"; + } + return result; + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx.designer.cs new file mode 100644 index 00000000..4012a41b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTailTermList.aspx.designer.cs @@ -0,0 +1,215 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectTailTermList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlApproveState 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// txtStartTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnNew 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnModify 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnModify; + + /// + /// btnSubmitReview 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSubmitReview; + + /// + /// btnwithdraw 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnwithdraw; + + /// + /// lblIsOverdue 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label lblIsOverdue; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuView 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuView; + + /// + /// btnMenuDel 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx new file mode 100644 index 00000000..98a90fe8 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx @@ -0,0 +1,83 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTemplate.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectTemplate" %> + + + + + + 宸ヤ綔鍖呮ā鏉跨鐞 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx.cs new file mode 100644 index 00000000..1f21741b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx.cs @@ -0,0 +1,183 @@ +锘縰sing BLL; +using Model; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class InspectTemplate : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.BindGrid(); + } + } + + #region 鏁版嵁缁戝畾 + + /// + /// 缁戝畾鏁版嵁 + /// + public void BindGrid() + { + string strSql = @"select * from ProduceRun_WorkInspectTemplate "; + List listStr = new List(); + if (!string.IsNullOrWhiteSpace(txtsWorkInspectName.Text)) + { + strSql += "and WorkInspectName like '%" + txtsWorkInspectName.Text + "%'"; + } + strSql += " order by Sort asc"; + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 鎼滅储 + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 鍒嗛〉 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + /// + /// 鍒嗛〉涓嬫媺妗嗕簨浠 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 琛屾寜閽簨浠 + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "Delete") + { + string rowID = e.RowID; + var model = Funs.DB.ProduceRun_WorkInspectTemplate.FirstOrDefault(p => p.WorkInspectId == rowID); + if (model != null) + { + Funs.DB.ProduceRun_WorkInspectTemplate.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("鍒犻櫎鎴愬姛!"); + } + else + { + ShowNotify("鍒犻櫎閿欒!"); + } + } + } + + #endregion + + /// + /// 淇濆瓨 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var rowid = this.Grid1.Rows[i].DataKeys[0].ToString(); + var add = false; + ProduceRun_WorkInspectTemplate model = Funs.DB.ProduceRun_WorkInspectTemplate.FirstOrDefault(x => x.WorkInspectId == rowid); + if (model == null) + { + add = true; + model = new ProduceRun_WorkInspectTemplate(); + model.WorkInspectId = Guid.NewGuid().ToString(); + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i; + } + model.WorkInspectName = values.Value("WorkInspectName"); + model.Remark = values.Value("Remark"); + if (add) Funs.DB.ProduceRun_WorkInspectTemplate.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + } + BindGrid(); + ShowNotify("淇敼鎴愬姛!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 鏂板 + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + this.hidSelectedNodeID.Text = string.Empty; + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hidSelectedNodeID.ClientID) + + Window1.GetShowReference($"InspectTemplateEdit.aspx?WorkInspectId=", "鏂板")); + } + + /// + /// 缂栬緫 + /// + protected void btnEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + ShowNotify("璇烽夋嫨涓鏉℃暟鎹!", MessageBoxIcon.Warning); + return; + } + var rowIndex = Grid1.SelectedRowIndex; + var rowId = Grid1.DataKeys[rowIndex][0].ToString(); + this.hidSelectedNodeID.Text = string.Empty; + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hidSelectedNodeID.ClientID) + + Window1.GetShowReference($"InspectTemplateEdit.aspx?WorkInspectId={rowId}", "缂栬緫")); + } + + /// + /// 鏂板/缂栬緫鍏抽棴 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx.designer.cs new file mode 100644 index 00000000..3d165b5e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplate.aspx.designer.cs @@ -0,0 +1,179 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectTemplate + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtsWorkInspectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtsWorkInspectName; + + /// + /// btnSearch 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// ToolbarFill 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnAdd 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// btnEdit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnEdit; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hidSelectedNodeID 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox hidSelectedNodeID; + + /// + /// txtWorkInspectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtWorkInspectName; + + /// + /// txtRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// ToolbarSeparator2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2; + + /// + /// ToolbarText2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText2; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx new file mode 100644 index 00000000..760f6b06 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx @@ -0,0 +1,59 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTemplateEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectTemplateEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx.cs new file mode 100644 index 00000000..a181ad47 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx.cs @@ -0,0 +1,78 @@ +锘縰sing 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.Produce +{ + public partial class InspectTemplateEdit : PageBase + { + /// + /// 涓婚敭 + /// + public string WorkInspectId + { + get { return (string)ViewState["WorkInspectId"]; } + set { ViewState["WorkInspectId"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.WorkInspectId = Request.Params["WorkInspectId"]; + PageInit(); + } + } + + /// + /// 榛樿缁戝畾 + /// + public void PageInit() + { + if (!string.IsNullOrWhiteSpace(this.WorkInspectId)) + { + var model = Funs.DB.ProduceRun_WorkInspectTemplate.FirstOrDefault(x => x.WorkInspectId == this.WorkInspectId); + txtWorkInspectName.Text = model.WorkInspectName; + txtRemark.Text = model.Remark; + txtSort.Text = model.Sort != null ? model.Sort.ToString() : (Funs.DB.ProduceRun_WorkInspectTemplate.Count() + 1).ToString(); + } + else + { + txtSort.Text = (Funs.DB.ProduceRun_WorkInspectTemplate.Count() + 1).ToString(); + } + } + + /// + /// 淇濆瓨 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + var model = Funs.DB.ProduceRun_WorkInspectTemplate.FirstOrDefault(x => x.WorkInspectId == this.WorkInspectId); + if (model == null) model = new Model.ProduceRun_WorkInspectTemplate(); + model.WorkInspectName = txtWorkInspectName.Text; + model.Remark = txtRemark.Text; + model.Sort = int.Parse(txtSort.Text); + if (string.IsNullOrWhiteSpace(this.WorkInspectId)) + { + model.WorkInspectId = Guid.NewGuid().ToString(); + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.ProduceRun_WorkInspectTemplate.InsertOnSubmit(model); + } + Funs.DB.SubmitChanges(); + ShowNotify("淇濆瓨鎴愬姛!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.WorkInspectId) + ActiveWindow.GetHidePostBackReference()); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx.designer.cs new file mode 100644 index 00000000..31b90a1b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectTemplateEdit.aspx.designer.cs @@ -0,0 +1,134 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectTemplateEdit + { + + /// + /// 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; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hdAttachUrl 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// hdId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtWorkInspectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtWorkInspectName; + + /// + /// txtRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// txtSort 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.NumberBox txtSort; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx new file mode 100644 index 00000000..9355df32 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx @@ -0,0 +1,119 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutAllPass.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectWanderAboutAllPass" %> + + + + + + 鍏ㄩ儴閫氳繃 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx.cs new file mode 100644 index 00000000..3872d393 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx.cs @@ -0,0 +1,155 @@ +锘縰sing 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.Produce +{ + public partial class InspectWanderAboutAllPass : PageBase + { + /// + /// 妫鏌ヨ〃涓婚敭 + /// + public string SubInspectId + { + get { return (string)ViewState["SubInspectId"]; } + set { ViewState["SubInspectId"] = value; } + } + + /// + /// 缁熶竴澶勭悊闄勪欢 + /// + public int UnifyImg + { + get { return (int)ViewState["UnifyImg"]; } + set { ViewState["UnifyImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.UnifyImg = 0; + this.SubInspectId = Request["SubInspectId"]; + PageInit(); + } + } + + /// + /// 缁戝畾鏁版嵁 + /// + public void PageInit() + { + var data = from term in Funs.DB.ProduceRun_SubInspectTerm + join pro in Funs.DB.Base_Project on term.ProjectId equals pro.ProjectId + join ua in Funs.DB.Sys_User on term.Contractor equals ua.UserId + join ub in Funs.DB.Sys_User on term.Owner equals ub.UserId + join uc in Funs.DB.Sys_User on term.ProcessPatent equals uc.UserId + where term.SubInspectId == this.SubInspectId + select new + { + term.SubInspectId, + term.ProjectId, + pro.ProjectName, + pro.ProjectCode, + term.AddUser, + term.AddTime, + ContractorName = ua.UserName, + OwnerName = ub.UserName, + ProcessPatentName = uc.UserName, + term.IsUnifyWanderAbout, + term.UnifyWanderAboutData, + term.UnifyWanderAboutOpinion + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //椤圭洰鍚嶇О + lblProjectName.Text = model.ProjectName; + //椤圭洰鍙 + lblProjectCode.Text = model.ProjectCode; + //鎵垮寘鍟 + lblContractorName.Text = model.ContractorName; + //涓氫富 + lblOwnerName.Text = model.OwnerName; + //宸ヨ壓涓撳埄鍟 + lblProcessPatentName.Text = model.ProcessPatentName; + //鏄惁缁熶竴娴佽浆 + rblIsUnifyWanderAbout.SelectedValue = model.IsUnifyWanderAbout != null ? model.IsUnifyWanderAbout.ToString() : "1"; + //瀹℃牳鎰忚 + txtUnifyWanderAboutOpinion.Text = model.UnifyWanderAboutOpinion; + } + } + + /// + /// 纭 + /// + protected void btnConfirm_Click(object sender, EventArgs e) + { + try + { + if (Funs.DB.AttachFile.Count(x => x.ToKeyId == this.SubInspectId + "_unify" && x.AttachUrl != null && x.AttachUrl != "") == 0) + { + ShowNotify("璇蜂笂浼犻檮浠讹紒", MessageBoxIcon.Warning); + return; + } + var term = Funs.DB.ProduceRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId); + if (term != null) + { + var isPass = int.Parse(rblIsUnifyWanderAbout.SelectedValue); + term.IsUnifyWanderAbout = isPass; + term.UnifyWanderAboutData = DateTime.Now; + term.UnifyWanderAboutOpinion = txtUnifyWanderAboutOpinion.Text; + term.ContractorIsAllPass = isPass; + term.OwnerIsAllPass = isPass; + term.ProcessPatentIsAllPass = isPass; + term.WanderIsComplete = isPass; + term.InspectIsClose = isPass; + if (isPass == 1) + { + term.ContractorAllPassData = DateTime.Now; + term.OwnerAllPassData = DateTime.Now; + term.ProcessPatentAllPassData = DateTime.Now; + term.WanderCompleteData = DateTime.Now; + term.InspectCloseData = DateTime.Now; + } + else + { + term.ContractorAllPassData = null; + term.OwnerAllPassData = null; + term.ProcessPatentAllPassData = null; + term.WanderCompleteData = null; + term.InspectCloseData = null; + } + var termIetms = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).ToList(); + if (termIetms.Count > 0) + { + foreach (var item in termIetms) + { + item.ContractorIsPass = isPass; + item.OwnerIsPass = isPass; + item.ProcessPatentIsPass = isPass; + Funs.DB.SubmitChanges(); + } + } + ShowNotify("纭鎴愬姛!", MessageBoxIcon.Success); + } + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 闄勪欢涓婁紶 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", UnifyImg, this.SubInspectId + "_unify", Const.TestRunMenuId))); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx.designer.cs new file mode 100644 index 00000000..6445c193 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPass.aspx.designer.cs @@ -0,0 +1,197 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectWanderAboutAllPass + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblProjectCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblProjectCode; + + /// + /// lblContractorName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblContractorName; + + /// + /// lblOwnerName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblOwnerName; + + /// + /// lblProcessPatentName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblProcessPatentName; + + /// + /// lblWorkPackName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblWorkPackName; + + /// + /// txtUnifyWanderAboutOpinion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtUnifyWanderAboutOpinion; + + /// + /// rblIsUnifyWanderAbout 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.RadioButtonList rblIsUnifyWanderAbout; + + /// + /// Panel3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// lblAttach 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// btnAttach 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnConfirm 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnConfirm; + + /// + /// WindowAtt 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx new file mode 100644 index 00000000..fc0d6a27 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx @@ -0,0 +1,127 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutAllPassList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectWanderAboutAllPassList" %> + + + + + + + + + 妫鏌ヨ〃娴佽浆鍏ㄩ儴閫氳繃 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx.cs new file mode 100644 index 00000000..7f7d1e63 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx.cs @@ -0,0 +1,123 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class InspectWanderAboutAllPassList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + BindGrid(); + } + } + + #region 鏁版嵁缁戝畾 + + /// + /// 缁戝畾鏁版嵁 + /// + public void BindGrid() + { + string sqlStr = $"select a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.AddUser,a.AddTime,c.UserName as ContractorName,d.UserName as OwnerName,e.UserName as ProcessPatentName,IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '鏄' else '鍚' end) as IsUnifyWanderAboutName from ProduceRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId inner join Sys_User as c on c.UserId=a.Contractor inner join Sys_User as d on d.UserId=a.Owner inner join Sys_User as e on e.UserId = a.ProcessPatent where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId='{this.CurrUser.LoginProjectId}' "; + List listStr = new List(); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(sqlStr); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 鍒嗛〉 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鍙屽嚮浜嬩欢 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuAllPass_Click(null, null); + } + + /// + /// 鍒嗛〉涓嬫媺妗 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 鎸夐挳鍜屼簨浠 + + /// + /// 鏌ヨ + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 妫鏌ュ叏閮ㄩ氳繃 + /// + protected void btnAllPass_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇烽夋嫨璁板綍锛", MessageBoxIcon.Warning); + return; + } + if (Grid1.SelectedRowIndexArray.Length > 1) + { + Alert.ShowInTop("鍙彲閫夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectWanderAboutAllPass.aspx?SubInspectId={0}", Grid1.DataKeys[Grid1.SelectedRowIndex][0].ToString(), "妫鏌ュ叏閮ㄩ氳繃 - "))); + } + + /// + /// 鍙冲嚮妫鏌ュ叏閮ㄩ氳繃 + /// + protected void btnMenuAllPass_Click(object sender, EventArgs e) + { + btnAllPass_Click(null, null); + } + + /// + /// 鍏抽棴 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx.designer.cs new file mode 100644 index 00000000..4bb27248 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutAllPassList.aspx.designer.cs @@ -0,0 +1,134 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectWanderAboutAllPassList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnQuery 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnAllPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAllPass; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuAllPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuAllPass; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx new file mode 100644 index 00000000..be787d20 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx @@ -0,0 +1,137 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutConfirm.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectWanderAboutConfirm" %> + + + + + + 绛惧瓧纭 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx.cs new file mode 100644 index 00000000..65ba8822 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx.cs @@ -0,0 +1,649 @@ +锘縰sing BLL; +using Newtonsoft.Json.Linq; +using NPOI.SS.UserModel; +using NPOI.SS.Util; +using NPOI.XSSF.UserModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class InspectWanderAboutConfirm : PageBase + { + /// + /// 妫鏌ヨ〃涓婚敭 + /// + public string SubInspectId + { + get { return (string)ViewState["SubInspectId"]; } + set { ViewState["SubInspectId"] = value; } + } + + /// + /// 绫诲瀷 + /// + public int ConfirmType + { + get { return (int)ViewState["ConfirmType"]; } + set { ViewState["ConfirmType"] = value; } + } + + /// + /// 绫诲瀷鍚嶇О + /// + public string ConfirmTypeName + { + get { return (string)ViewState["ConfirmTypeName"]; } + set { ViewState["ConfirmTypeName"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.SubInspectId = Request.Params["SubInspectId"]; + this.ConfirmType = int.Parse(Request.Params["ConfirmType"]); + + if (this.ConfirmType == 1) + { + this.ConfirmTypeName = "鎵垮寘鍟"; + } + if (this.ConfirmType == 2) + { + this.ConfirmTypeName = "涓氫富"; + } + if (this.ConfirmType == 3) + { + this.ConfirmTypeName = "宸ヨ壓涓撳埄鍟"; + } + this.BindGrid(); + } + } + + + #region 鏁版嵁缁戝畾 + + /// + /// 缁戝畾鏁版嵁 + /// + public void BindGrid(int isPass = -1) + { + var term = Funs.DB.ProduceRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId); + if (term != null) + { + lblIsUnifyWanderAbout.Text = term.IsUnifyWanderAbout == 1 ? "鏄" : "鍚"; + lblUnifyWanderAboutData.Text = term.UnifyWanderAboutData != null ? term.UnifyWanderAboutData.Value.ToString("yyyy-MM-dd") : string.Empty; + unifyfile.Hidden = term.IsUnifyWanderAbout == 1 ? false : true; + } + var data = new List(); + var queryData = from a in Funs.DB.ProduceRun_SubInspectTermItem + join b in Funs.DB.Sys_User on a.InspectedUser equals b.UserId + where a.SubInspectId == this.SubInspectId + select new { a, b }; + if (queryData.Count() > 0) + { + var list = queryData.ToList(); + foreach (var item in list) + { + var model = new ConfirmIsPass(); + model.TermItemId = item.a.TermItemId; + model.SubInspectId = item.a.SubInspectId; + model.WorkInspectName = item.a.WorkInspectName; + model.ConfirmType = this.ConfirmType; + model.ConfirmTypeName = this.ConfirmTypeName; + model.InspectedUser = item.a.InspectedUser; + model.InspectedUserName = item.b.UserName; + model.InspectionResults = item.a.InspectionResults.Value; + //1=鎵垮寘鍟=涓氫富=宸ヨ壓涓撳埄鍟 + if (this.ConfirmType == 1) + { + model.IsPass = isPass != -1 ? isPass : item.a.ContractorIsPass; + model.Remark = item.a.ContractorRemark; + } + if (this.ConfirmType == 2) + { + model.IsPass = isPass != -1 ? isPass : item.a.OwnerIsPass; + model.Remark = item.a.OwnerRemark; + } + if (this.ConfirmType == 3) + { + model.IsPass = isPass != -1 ? isPass : item.a.ProcessPatentIsPass; + model.Remark = item.a.ProcessPatentRemark; + } + data.Add(model); + } + } + Grid1.DataSource = data; + Grid1.DataBind(); + titleName.Title = this.ConfirmType == 1 ? "鎵垮寘鍟嗙‘璁ょ瀛" : this.ConfirmType == 2 ? "涓氫富纭绛惧瓧" : this.ConfirmType == 3 ? "宸ヨ壓涓撳埄鍟嗙‘璁ょ瀛" : ""; + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + #endregion + + #region 鎸夐挳鍜屼簨浠 + + /// + /// 淇濆瓨 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + GridRow row = Grid1.Rows[i]; + System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)row.FindControl("rblIsPass"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var inspectedUser = this.Grid1.Rows[i].DataKeys[1].ToString(); + var model = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId && x.InspectedUser == inspectedUser); + if (model != null) + { + if (!string.IsNullOrWhiteSpace(rblIsPass.SelectedValue)) + { + //1=鎵垮寘鍟=涓氫富=宸ヨ壓涓撳埄鍟 + if (this.ConfirmType == 1) + { + model.ContractorIsPass = int.Parse(rblIsPass.SelectedValue); + model.ContractorRemark = values.Value("Remark"); + } + else if (this.ConfirmType == 2) + { + model.OwnerIsPass = int.Parse(rblIsPass.SelectedValue); + model.OwnerRemark = values.Value("Remark"); + } + else if (this.ConfirmType == 3) + { + model.ProcessPatentIsPass = int.Parse(rblIsPass.SelectedValue); + model.ProcessPatentRemark = values.Value("Remark"); + } + } + Funs.DB.SubmitChanges(); + } + } + var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString(); + var subModel = Funs.DB.ProduceRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId); + if (subModel != null) + { + //1=鎵垮寘鍟=涓氫富=宸ヨ壓涓撳埄鍟 + if (this.ConfirmType == 1) + { + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.ContractorIsPass.GetValueOrDefault() != 1) == 0) + { + subModel.ContractorIsAllPass = 1; + subModel.ContractorAllPassData = DateTime.Now; + } + else + { + subModel.ContractorIsAllPass = 0; + subModel.ContractorAllPassData = null; + } + } + else if (this.ConfirmType == 2) + { + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.OwnerIsPass.GetValueOrDefault() != 1) == 0) + { + subModel.OwnerIsAllPass = 1; + subModel.OwnerAllPassData = DateTime.Now; + } + else + { + subModel.OwnerIsAllPass = 0; + subModel.OwnerAllPassData = null; + } + } + else if (this.ConfirmType == 3) + { + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.ProcessPatentIsPass.GetValueOrDefault() != 1) == 0) + { + subModel.ProcessPatentIsAllPass = 1; + subModel.ProcessPatentAllPassData = DateTime.Now; + } + else + { + subModel.ProcessPatentIsAllPass = 0; + subModel.ProcessPatentAllPassData = null; + } + } + //鍒ゆ柇鏄惁鍏ㄩ儴閫氳繃 + if (subModel.ContractorIsAllPass == 1 && subModel.OwnerIsAllPass == 1 && subModel.ProcessPatentIsAllPass == 1) + { + subModel.InspectIsClose = 1; + subModel.InspectCloseData = DateTime.Now; + subModel.WanderIsComplete = 1; + subModel.WanderCompleteData = DateTime.Now; + } + else + { + subModel.InspectIsClose = 0; + subModel.InspectCloseData = null; + subModel.WanderIsComplete = 0; + subModel.WanderCompleteData = null; + } + } + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("淇濆瓨鎴愬姛!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 瀵煎嚭 + /// + protected void btnExport_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/") + Const.ExcelUrl; + //瀵煎嚭鏂囦欢 + string filePath = rootPath + DateTime.Now.ToString("yyyyMMddhhmmss") + "\\"; + if (!Directory.Exists(filePath)) + { + Directory.CreateDirectory(filePath); + } + string ReportFileName = filePath + this.ConfirmTypeName + "纭绛惧瓧.xlsx"; + //鑾峰彇宸ヤ綔鍖呮鏌ヨ〃 + var termData = from a in Funs.DB.ProduceRun_SubInspectTerm + join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId + select new { a.SubInspectId, a.ProjectId, b.ProjectName, b.ShortName, b.ProjectCode, a.Contractor, a.Owner, a.ProcessPatent, a.InspectionIsAllPass, a.ContractorIsAllPass, a.OwnerIsAllPass, a.ProcessPatentIsAllPass, a.InspectTime, a.AddUser, a.AddTime }; + if (termData != null) + { + var termModel = termData.FirstOrDefault(); + //鑾峰彇宸ヤ綔鍖呮鏌ラ」琛 + var termItems = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList(); + int rowIndex = 0; + XSSFWorkbook hssfworkbook = new XSSFWorkbook(); + XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet(this.ConfirmTypeName + "纭绛惧瓧"); + + #region 鍒楀 + + ws.SetColumnWidth(0, (7 * 256)); + ws.SetColumnWidth(1, (4 * 256)); + ws.SetColumnWidth(2, (4 * 256)); + ws.SetColumnWidth(3, (4 * 256)); + ws.SetColumnWidth(4, (10 * 256)); + ws.SetColumnWidth(5, (10 * 256)); + ws.SetColumnWidth(6, (10 * 256)); + ws.SetColumnWidth(7, (10 * 256)); + ws.SetColumnWidth(8, (3 * 256)); + ws.SetColumnWidth(9, (3 * 256)); + ws.SetColumnWidth(10, (3 * 256)); + ws.SetColumnWidth(11, (3 * 256)); + ws.SetColumnWidth(12, (3 * 256)); + ws.SetColumnWidth(13, (3 * 256)); + ws.SetColumnWidth(14, (3 * 256)); + ws.SetColumnWidth(15, (3 * 256)); + ws.SetColumnWidth(16, (3 * 256)); + ws.SetColumnWidth(17, (3 * 256)); + + #endregion + + #region 鏍峰紡 + //澶撮儴鏍峰紡灞呬腑 + ICellStyle titleStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 14, true, true); + //澶撮儴鏍峰紡闈犲乏 + ICellStyle leftTitleStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 14, true, true); + //鍏叡鏍峰紡 + ICellStyle style = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 10.5, true); + //鍏叡鏍峰紡闈犲乏 + ICellStyle leftStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 10.5, true); + //鍏叡鏍峰紡闈犲乏涓婂鍏 + ICellStyle leftTopStyle = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Top, HorizontalAlignment.Left, 10.5, true); + //鍏叡鏍峰紡鍔犵矖 + ICellStyle styleBold = SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 10.5, true, true); + + #endregion + + #region 澶撮儴 + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex, rowIndex + 5, 0, 17); + //琛1 + var region = new CellRangeAddress(rowIndex, rowIndex + 2, 0, 0); + ws.AddMergedRegion(region); + byte[] bytes = File.ReadAllBytes(Server.MapPath("~/") + "Images\\Template.png"); + int pictureIdx = hssfworkbook.AddPicture(bytes, PictureType.JPEG); + IDrawing patriarch = ws.CreateDrawingPatriarch(); + IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 0, rowIndex, 1, rowIndex + 2); + IPicture pict = patriarch.CreatePicture(anchor, pictureIdx); + //pict.Resize(); + region = new CellRangeAddress(rowIndex, rowIndex + 2, 1, 3); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(1).SetCellValue("涓浗浜旂幆宸ョ▼鏈夐檺鍏徃"); + ws.GetRow(rowIndex).GetCell(1).CellStyle = + ws.GetRow(rowIndex).GetCell(2).CellStyle = + ws.GetRow(rowIndex).GetCell(3).CellStyle = leftTitleStyle; + region = new CellRangeAddress(rowIndex, rowIndex, 4, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(4).SetCellValue(termModel.ProjectName); + ws.GetRow(rowIndex).GetCell(4).CellStyle = style; + region = new CellRangeAddress(rowIndex, rowIndex, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(8).SetCellValue("椤圭洰鍙"); + ws.GetRow(rowIndex).GetCell(8).CellStyle = style; + region = new CellRangeAddress(rowIndex, rowIndex, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(13).SetCellValue(termModel.ProjectCode); + ws.GetRow(rowIndex).GetCell(13).CellStyle = style; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 4, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(4).SetCellValue(""); + ws.GetRow(rowIndex + 1).GetCell(4).CellStyle = style; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(8).SetCellValue("锛堟枃浠跺彿锛"); + ws.GetRow(rowIndex + 1).GetCell(8).CellStyle = style; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(13).SetCellValue(""); + ws.GetRow(rowIndex + 1).GetCell(13).CellStyle = style; + region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 4, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 2).GetCell(4).SetCellValue($"鐢熶骇鎬ц兘鑰冩牳妫鏌ヨ〃"); + ws.GetRow(rowIndex + 2).GetCell(4).CellStyle = titleStyle; + region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 2).GetCell(8).SetCellValue("绗 1 椤"); + ws.GetRow(rowIndex + 2).GetCell(8).CellStyle = style; + region = new CellRangeAddress(rowIndex + 2, rowIndex + 2, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 2).GetCell(13).SetCellValue("鍏 1 椤"); + ws.GetRow(rowIndex + 2).GetCell(13).CellStyle = style; + //琛4,琛5 + region = new CellRangeAddress(rowIndex + 3, rowIndex + 4, 0, 2); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 3).GetCell(0).CellStyle = style; + ws.GetRow(rowIndex + 3).GetCell(0).SetCellValue(""); + region = new CellRangeAddress(rowIndex + 3, rowIndex + 4, 3, 11); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 3).GetCell(3).CellStyle = leftStyle; + ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue(""); + region = new CellRangeAddress(rowIndex + 3, rowIndex + 3, 12, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 3).GetCell(12).CellStyle = style; + ws.GetRow(rowIndex + 3).GetCell(12).SetCellValue("妫鏌ユ棩鏈"); + region = new CellRangeAddress(rowIndex + 4, rowIndex + 4, 12, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 4).GetCell(12).CellStyle = style; + ws.GetRow(rowIndex + 4).GetCell(12).SetCellValue(DateTime.Now.ToString("yyyy骞碝M鏈坉d鏃")); + //琛6 + ws.GetRow(rowIndex + 5).GetCell(0).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(0).SetCellValue("搴忓彿"); + region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 1, 7); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 5).GetCell(1).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(1).SetCellValue("妫鏌ラ」鐩"); + region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 8, 12); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 5).GetCell(8).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(8).SetCellValue("缁撴灉"); + region = new CellRangeAddress(rowIndex + 5, rowIndex + 5, 13, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 5).GetCell(13).CellStyle = styleBold; + ws.GetRow(rowIndex + 5).GetCell(13).SetCellValue("澶囨敞"); + + #endregion + + #region 琛ㄦ牸 + + var start = rowIndex + 6; + var end = rowIndex + 5 + termItems.Count; + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 17); + + //鍚堝苟鍗曞厓鏍 + for (int hb = start; hb <= end; hb++) + { + region = new CellRangeAddress(hb, hb, 1, 7); + ws.AddMergedRegion(region); + region = new CellRangeAddress(hb, hb, 8, 12); + ws.AddMergedRegion(region); + region = new CellRangeAddress(hb, hb, 13, 17); + ws.AddMergedRegion(region); + } + + //鏁版嵁 + int num = 1; + var dataIndex = 6; + foreach (var item in termItems) + { + //搴忓彿 + ws.GetRow(dataIndex).GetCell(0).SetCellValue(num); + //妫鏌ラ」鐩 + ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.WorkInspectName); + ws.GetRow(dataIndex).GetCell(1).CellStyle = leftStyle; + //缁撴灉 + ws.GetRow(dataIndex).GetCell(8).SetCellValue(""); + //澶囨敞 + ws.GetRow(dataIndex).GetCell(13).SetCellValue(""); + dataIndex++; + num++; + } + rowIndex = start + termItems.Count; + + #endregion + + #region 灏鹃儴 + + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex, rowIndex, 0, 17, 100); + //琛1 + ws.GetRow(rowIndex).GetCell(0).SetCellValue("缁撹"); + region = new CellRangeAddress(rowIndex, rowIndex, 1, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex).GetCell(1).SetCellValue("鏄惁鍚屾剰杩涜锛堝寘鎷暣鏀规剰瑙侊級锛"); + ws.GetRow(rowIndex).GetCell(1).CellStyle = leftTopStyle; + //琛2 + ws = ExcelCreateRowTitle(ws, hssfworkbook, style, rowIndex + 1, rowIndex + 1, 0, 17, 80); + ws.GetRow(rowIndex + 1).GetCell(0).SetCellValue("妫鏌ヤ汉鍛"); + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 1, 4); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(1).SetCellValue("鏂藉伐鍗曚綅锛"); + ws.GetRow(rowIndex + 1).GetCell(1).CellStyle = leftTopStyle; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 5, 6); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(5).SetCellValue("鎵垮寘鍟嗭細"); + ws.GetRow(rowIndex + 1).GetCell(5).CellStyle = leftTopStyle; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 7, 11); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(7).SetCellValue("涓氫富锛"); + ws.GetRow(rowIndex + 1).GetCell(7).CellStyle = leftTopStyle; + region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 12, 17); + ws.AddMergedRegion(region); + ws.GetRow(rowIndex + 1).GetCell(12).SetCellValue("宸ヨ壓涓撳埄鍟嗭細"); + ws.GetRow(rowIndex + 1).GetCell(12).CellStyle = leftTopStyle; + + #endregion + + ws.PrintSetup.Landscape = false; + ws.PrintSetup.PaperSize = 9; + ws.ForceFormulaRecalculation = true; + using (FileStream filess = File.OpenWrite(ReportFileName)) + { + hssfworkbook.Write(filess); + } + FileInfo filet = new FileInfo(ReportFileName); + Response.Clear(); + Response.Charset = "GB2312"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + // 娣诲姞澶翠俊鎭紝涓"鏂囦欢涓嬭浇/鍙﹀瓨涓"瀵硅瘽妗嗘寚瀹氶粯璁ゆ枃浠跺悕 + Response.AddHeader("Content-Disposition", "attachment; filename=" + Server.UrlEncode(this.ConfirmTypeName + "纭绛惧瓧.xlsx")); + // 娣诲姞澶翠俊鎭紝鎸囧畾鏂囦欢澶у皬锛岃娴忚鍣ㄨ兘澶熸樉绀轰笅杞借繘搴 + Response.AddHeader("Content-Length", filet.Length.ToString()); + // 鎸囧畾杩斿洖鐨勬槸涓涓笉鑳借瀹㈡埛绔鍙栫殑娴侊紝蹇呴』琚笅杞 + Response.ContentType = "application/ms-excel"; + // 鎶婃枃浠舵祦鍙戦佸埌瀹㈡埛绔 + Response.WriteFile(filet.FullName); + // 鍋滄椤甸潰鐨勬墽琛 + Response.End(); + } + } + + /// + /// 琛屽姞杞戒簨浠 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)Grid1.Rows[e.RowIndex].FindControl("rblIsPass"); + int isPass = 1; + if (Grid1.DataKeys[e.RowIndex][4] != null) isPass = int.Parse(Grid1.DataKeys[e.RowIndex][4].ToString()); + rblIsPass.SelectedValue = isPass.ToString(); + if (rblIsPass.SelectedValue != "1") + { + rblIsAllPass.SelectedValue = "0"; + } + } + + /// + /// 瀹炰綋缁戝畾 + /// + public class ConfirmIsPass + { + /// + /// 妫鏌ラ」涓婚敭 + /// + public string TermItemId { get; set; } + /// + /// 妫鏌ヨ〃涓婚敭 + /// + public string SubInspectId { get; set; } + /// + /// 妫鏌ヤ汉 + /// + public string InspectedUser { get; set; } + /// + /// 妫鏌ヤ汉鍚嶇О + /// + public string InspectedUserName { get; set; } + /// + /// 妫鏌ョ粨鏋 + /// + public int InspectionResults { get; set; } + /// + /// 鍚嶇О + /// + public string WorkInspectName { get; set; } + /// + /// 纭绫诲瀷1=鎵垮寘鍟2=涓氫富3=宸ヨ壓涓撳埄鍟 + /// + public int ConfirmType { get; set; } + /// + /// 纭绫诲瀷鍚嶇О + /// + public string ConfirmTypeName { get; set; } + /// + /// 鏄惁閫氳繃 + /// + public int? IsPass { get; set; } + /// + /// 澶囨敞 + /// + public string Remark { get; set; } + + } + + /// + /// 妫鏌ラ」纭浜嬩欢 + /// + protected void rblIsPass_SelectedIndexChanged(object sender, EventArgs e) + { + for (int i = 0; i < Grid1.Rows.Count; i++) + { + System.Web.UI.WebControls.RadioButtonList rblIsPass = (System.Web.UI.WebControls.RadioButtonList)Grid1.Rows[i].FindControl("rblIsPass"); + if (rblIsPass.SelectedValue != "1") + { + rblIsAllPass.SelectedValue = "0"; + } + } + } + + /// + /// 鏄惁鍚屾剰杩涜棰勮瘯杞︽椿鍔ㄤ簨浠 + /// + protected void rblIsAllPass_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(int.Parse(rblIsAllPass.SelectedValue)); + } + + /// + /// 闄勪欢涓婁紶 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", $"{this.SubInspectId}_{this.ConfirmType}", Const.TestRunMenuId))); + } + + /// + /// 缁熶竴娴佽浆閫氳繃闄勪欢鏌ョ湅 + /// + protected void btnUnifyUpload_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", this.SubInspectId + "_unify", Const.TestRunMenuId))); + } + + #endregion + + #region 绉佹湁鏂规硶 + + /// + /// 鍒涘缓鏍峰紡 + /// + /// + public static ICellStyle SetExcelStyle(XSSFWorkbook wb, BorderStyle Bottom, BorderStyle Left, BorderStyle Right, BorderStyle Top, VerticalAlignment VerAig, HorizontalAlignment HorAig, double FontSize, bool WrapText = true, bool Bold = false, string FontName = "瀹嬩綋") + { + ICellStyle style = wb.CreateCellStyle(); + style.BorderBottom = Bottom; + style.BorderLeft = Left; + style.BorderRight = Right; + style.BorderTop = Top; + style.VerticalAlignment = VerAig; + style.Alignment = HorAig; + IFont font = wb.CreateFont(); + font.FontHeightInPoints = FontSize; + font.IsBold = Bold; + font.FontName = FontName; + style.SetFont(font); + style.WrapText = WrapText; + return style; + } + + /// + /// 鍒涘缓澶撮儴 + /// + /// + private XSSFSheet ExcelCreateRowTitle(XSSFSheet ws, XSSFWorkbook hssfworkbook, ICellStyle style, int sRows, int eRows, int cStart, int cEnd, float height = 21) + { + for (int i = sRows; i <= eRows; i++) + { + ws.CreateRow(i); + ws.GetRow(i).HeightInPoints = height; + for (int j = cStart; j <= cEnd; j++) + { + ws.GetRow(i).CreateCell(j); + ws.GetRow(i).CreateCell(j).CellStyle = style; + } + } + return ws; + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx.designer.cs new file mode 100644 index 00000000..bfe666bc --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutConfirm.aspx.designer.cs @@ -0,0 +1,233 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectWanderAboutConfirm + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// plApprove2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// titleName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel titleName; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnExport 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnExport; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// rblIsPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.RadioButtonList rblIsPass; + + /// + /// txtRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// ContentPanel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// rblIsAllPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.RadioButtonList rblIsAllPass; + + /// + /// Panel3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// lblAttach 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// btnAttach 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// lblIsUnifyWanderAbout 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblIsUnifyWanderAbout; + + /// + /// lblUnifyWanderAboutData 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblUnifyWanderAboutData; + + /// + /// unifyfile 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.FormRow unifyfile; + + /// + /// Panel2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// btnUnifyUpload 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnUnifyUpload; + + /// + /// WindowAtt 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx new file mode 100644 index 00000000..1fcb90fd --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx @@ -0,0 +1,129 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.InspectWanderAboutList" %> + + + + + + + + + 妫鏌ヨ〃娴佽浆 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx.cs new file mode 100644 index 00000000..cc0ace1f --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx.cs @@ -0,0 +1,131 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class InspectWanderAboutList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + BindGrid(); + } + } + + #region 鏁版嵁缁戝畾 + + /// + /// 缁戝畾鏁版嵁 + /// + public void BindGrid() + { + //鎵垮寘鍟 + string contractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Contractor,a.Owner,a.ProcessPatent,1 as ConfirmType,'鎵垮寘鍟' as ConfirmName,(select count (1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.ContractorIsPass is null) as WaitConfirmNum,(select count (1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.ContractorIsPass=1) as PassConfirmNum,(select count (1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.ContractorIsPass=0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '鏄' else '鍚' end) as IsUnifyWanderAboutName from ProduceRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.InspectionIsAllPass=1 and a.ProjectId='{this.CurrUser.LoginProjectId}' and a.Contractor='{this.CurrUser.UserId}' "; + //涓氫富 + string ownerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Contractor,a.Owner,a.ProcessPatent,2 as ConfirmType,'涓氫富' as ConfirmName,(select count(1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass is null) as WaitConfirmNum,(select count(1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 1) as PassConfirmNum,(select count(1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '鏄' else '鍚' end) as IsUnifyWanderAboutName from ProduceRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1=1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Owner = '{this.CurrUser.UserId}' "; + //宸ヨ壓涓撳埄鍟 + string processPatentStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.Contractor,a.Owner,a.ProcessPatent,3 as ConfirmType,'宸ヨ壓涓撳埄鍟' as ConfirmName,(select count(1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ProcessPatentIsPass is null) as WaitConfirmNum,(select count(1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ProcessPatentIsPass = 1) as PassConfirmNum,(select count(1) from ProduceRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ProcessPatentIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '鏄' else '鍚' end) as IsUnifyWanderAboutName from ProduceRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1=1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.ProcessPatent = '{this.CurrUser.UserId}' "; + + var allSql = $"select * from ({contractorStr} union all {ownerStr} union all {processPatentStr}) as t order by t.ConfirmType asc"; + List listStr = new List(); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(allSql); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + + } + + /// + /// 鍒嗛〉 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鍙屽嚮浜嬩欢 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuConfirmation_Click(null, null); + } + + /// + /// 鍒嗛〉涓嬫媺妗 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 鎸夐挳鍜屼簨浠 + + /// + /// 鏌ヨ + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 妫鏌ョ‘璁 + /// + protected void btnConfirmation_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇烽夋嫨璁板綍锛", MessageBoxIcon.Warning); + return; + } + if (Grid1.SelectedRowIndexArray.Length > 1) + { + Alert.ShowInTop("鍙彲閫夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectWanderAboutConfirm.aspx?SubInspectId={0}&ConfirmType={1}", Grid1.DataKeys[Grid1.SelectedRowIndex][1].ToString(), Grid1.DataKeys[Grid1.SelectedRowIndex][2].ToString(), "缂栬緫 - "))); + } + + /// + /// 鍙冲嚮妫鏌ョ‘璁 + /// + protected void btnMenuConfirmation_Click(object sender, EventArgs e) + { + btnConfirmation_Click(null, null); + } + + /// + /// 鍏抽棴 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx.designer.cs new file mode 100644 index 00000000..04dd58ff --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/InspectWanderAboutList.aspx.designer.cs @@ -0,0 +1,134 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class InspectWanderAboutList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnQuery 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnConfirmation 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnConfirmation; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuConfirmation 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuConfirmation; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx new file mode 100644 index 00000000..ef61e307 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx @@ -0,0 +1,122 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SubInspectTerm.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.SubInspectTerm" %> + + + + + + 鐢熸垚宸ヤ綔鍖呮鏌 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx.cs new file mode 100644 index 00000000..a7335365 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx.cs @@ -0,0 +1,353 @@ +锘縰sing BLL; +using Model; +using Newtonsoft.Json.Linq; +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.Produce +{ + public partial class SubInspectTerm : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + PageInit(); + BindGrid(); + } + } + + #region 鏁版嵁缁戝畾 + + /// + /// 缁戝畾涓嬫媺妗 + /// + public void PageInit() + { + //妫鏌ヤ汉缁戝畾 + var userList = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); + var users = userList.ToList(); + if (addUserList.Count() > 0) + { + users.AddRange(addUserList); + } + if (users.Count() > 0) + { + ddlContractor.DataTextField = "UserName"; + ddlContractor.DataValueField = "UserId"; + ddlContractor.DataSource = users; + ddlContractor.DataBind(); + + ddlOwner.DataTextField = "UserName"; + ddlOwner.DataValueField = "UserId"; + ddlOwner.DataSource = users; + ddlOwner.DataBind(); + + ddlProcessPatent.DataTextField = "UserName"; + ddlProcessPatent.DataValueField = "UserId"; + ddlProcessPatent.DataSource = users; + ddlProcessPatent.DataBind(); + } + } + + /// + /// 缁戝畾鏁版嵁 + /// + public void BindGrid() + { + var result = new List(); + var list = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).OrderBy(x => x.Sort).ToList(); + if (list.Count > 0) + { + foreach (var item in list) + { + var model = new ProduceRun_SubInspectTermItem(); + model.TermItemId = item.TermItemId; + model.ProjectId = item.ProjectId; + model.WorkInspectId = item.WorkInspectId; + model.WorkInspectName = item.WorkInspectName; + model.InspectedUser = item.InspectedUser; + model.InspectionResults = item.InspectionResults; + model.InspectionIllustrate = item.InspectionIllustrate; + model.Sort = item.Sort; + result.Add(model); + } + } + else + { + //鑾峰彇棰勫姞杞界殑鏁版嵁 + var defaultDatas = Funs.DB.ProduceRun_WorkInspectTemplate.OrderBy(x => x.Sort).ToList(); + if (defaultDatas.Count > 0) + { + int index = list.Count + 1; + foreach (var item in defaultDatas) + { + var model = new ProduceRun_SubInspectTermItem(); + model.TermItemId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = item.WorkInspectId; + model.WorkInspectName = item.WorkInspectName; + model.Sort = index + 1; + result.Add(model); + index++; + } + } + } + Grid1.DataSource = result; + Grid1.DataBind(); + //妫鏌ヤ汉缁戝畾 + var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); + var data = userList.ToList(); + if (addUserList.Count() > 0) + { + data.AddRange(addUserList); + } + DropDownList ddlInspectedUser = Grid1.FindColumn("InspectedUser").FindControl("ddlInspectedUser") as DropDownList; + ddlInspectedUser.DataTextField = "UserName"; + ddlInspectedUser.DataValueField = "UserId"; + ddlInspectedUser.DataSource = data; + ddlInspectedUser.DataBind(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + /// + /// 琛屾寜閽簨浠 + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "Delete") + { + string rowID = e.RowID; + var model = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(p => p.TermItemId == rowID); + if (model != null) + { + if (model.InspectionResults != null) + { + ShowNotify("宸插瓨鍦ㄦ鏌ョ粨鏋滐紝鏃犳硶鍒犻櫎!", MessageBoxIcon.Warning); + return; + } + Funs.DB.ProduceRun_SubInspectTermItem.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("鍒犻櫎鎴愬姛!"); + } + else + { + var list = gvList(); + list.RemoveAll(x => x.TermItemId == rowID); + Grid1.DataSource = list; + Grid1.DataBind(); + ShowNotify("鍒犻櫎鎴愬姛!"); + } + } + } + + #endregion + + /// + /// 淇濆瓨 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(ddlContractor.SelectedValue)) + { + ShowNotify("璇烽夋嫨鎵垮寘鍟!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlOwner.SelectedValue)) + { + ShowNotify("璇烽夋嫨涓氫富!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlProcessPatent.SelectedValue)) + { + ShowNotify("璇烽夋嫨宸ヨ壓涓撳埄鍟!", MessageBoxIcon.Warning); + return; + } + List subTrems = new List(); + List subTremItems = new List(); + var subTrem = Funs.DB.ProduceRun_SubInspectTerm.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId); + var termItems = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (termItems.Count > 0 && termItems.Count(x => x.InspectionResults == null) == 0) + { + ShowNotify("鎵鏈夋鏌ラ」宸插瓨鍦ㄦ鏌ョ粨鏋滐紝鏃犳硶淇濆瓨锛", MessageBoxIcon.Warning); + return; + } + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var workInspectId = this.Grid1.Rows[i].DataKeys[1].ToString(); + + //鑾峰彇瀛愮郴缁熶俊鎭 + var list = new List(); + if (subTrem == null) + { + subTrem = new ProduceRun_SubInspectTerm(); + subTrem.SubInspectId = Guid.NewGuid().ToString(); + subTrem.ProjectId = this.CurrUser.LoginProjectId; + subTrem.Contractor = ddlContractor.SelectedValue; + subTrem.Owner = ddlOwner.SelectedValue; + subTrem.ProcessPatent = ddlProcessPatent.SelectedValue; + subTrem.AddUser = this.CurrUser.UserId; + subTrem.AddTime = DateTime.Now; + subTrems.Add(subTrem); + } + else + { + subTrem.Contractor = ddlContractor.SelectedValue; + subTrem.Owner = ddlOwner.SelectedValue; + subTrem.ProcessPatent = ddlProcessPatent.SelectedValue; + Funs.DB.SubmitChanges(); + } + var model = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId); + if (model == null) + { + model = new ProduceRun_SubInspectTermItem(); + model.TermItemId = termItemId; + model.SubInspectId = subTrem.SubInspectId; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = workInspectId; + model.WorkInspectName = values.Value("WorkInspectName"); + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + subTrem.Contractor = ddlContractor.SelectedValue; + subTrem.Owner = ddlOwner.SelectedValue; + subTrem.ProcessPatent = ddlProcessPatent.SelectedValue; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i + 1; + subTremItems.Add(model); + } + else + { + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + model.WorkInspectName = values.Value("WorkInspectName"); + Funs.DB.SubmitChanges(); + } + } + + if (subTrems != null) Funs.DB.ProduceRun_SubInspectTerm.InsertAllOnSubmit(subTrems); + if (subTremItems.Count > 0) Funs.DB.ProduceRun_SubInspectTermItem.InsertAllOnSubmit(subTremItems); + Funs.DB.SubmitChanges(); + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == subTrem.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0) + { + subTrem.InspectionIsAllPass = 1; + } + else + { + subTrem.InspectionIsAllPass = 0; + } + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("淇濆瓨鎴愬姛!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + /// + /// 鏂板 + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + var list = gvList(); + var termItems = Funs.DB.ProduceRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (termItems.Count > 0 && termItems.Count(x => x.InspectionResults == null) == 0) + { + ShowNotify("鎵鏈夋鏌ラ」宸插瓨鍦ㄦ鏌ョ粨鏋滐紝鏃犳硶鏂板锛", MessageBoxIcon.Warning); + return; + } + var model = new ProduceRun_SubInspectTermItem(); + model.TermItemId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = string.Empty; + model.WorkInspectName = string.Empty; + model.Sort = list.Count + 1; + list.Add(model); + Grid1.DataSource = list; + Grid1.DataBind(); + } + + /// + /// 鑾峰彇闆嗗悎 + /// + private List gvList() + { + List list = new List(); + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var workInspectId = this.Grid1.Rows[i].DataKeys[1] != null ? this.Grid1.Rows[i].DataKeys[1].ToString() : string.Empty; + var subInspectId = this.Grid1.Rows[i].DataKeys[2] != null ? this.Grid1.Rows[i].DataKeys[2].ToString() : string.Empty; + + var model = new ProduceRun_SubInspectTermItem(); + model.TermItemId = termItemId; + model.SubInspectId = subInspectId; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = workInspectId; + model.WorkInspectName = values.Value("WorkInspectName"); + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i + 1; + list.Add(model); + } + return list; + } + + /// + /// 妫娴嬬粨鏋 + /// + /// + public string Results(object value) + { + var result = string.Empty; + + if (value != null) + { + var intVal = int.Parse(value.ToString()); + if (intVal == 1) + { + result = "閫氳繃"; + } + else if (intVal == 0) + { + result = "鏈氳繃"; + } + } + + return result; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx.designer.cs new file mode 100644 index 00000000..c2957bfb --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/SubInspectTerm.aspx.designer.cs @@ -0,0 +1,161 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class SubInspectTerm + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnAdd 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// txtWorkInspectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtWorkInspectName; + + /// + /// ddlInspectedUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlInspectedUser; + + /// + /// lblInspectionResults 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label lblInspectionResults; + + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// ddlContractor 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlContractor; + + /// + /// ddlOwner 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlOwner; + + /// + /// ddlProcessPatent 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlProcessPatent; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx new file mode 100644 index 00000000..0e9d7714 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx @@ -0,0 +1,112 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SubWorkInspect.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.SubWorkInspect" %> + + + + + + 宸ヤ綔鍖呮鏌 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx.cs new file mode 100644 index 00000000..53c8ca90 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx.cs @@ -0,0 +1,374 @@ +锘縰sing BLL; +using Newtonsoft.Json.Linq; +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.Produce +{ + public partial class SubWorkInspect : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.BindGrid(); + } + } + + #region 鏁版嵁缁戝畾 + + /// + /// 缁戝畾鏁版嵁 + /// + public void BindGrid(bool istail = false) + { + //鑾峰彇瀛愮郴缁 + var data = from termitem in Funs.DB.ProduceRun_SubInspectTermItem + join b in Funs.DB.ProduceRun_InspectTailTerm on termitem.TermItemId equals b.TermItemId into t + from tail in t.DefaultIfEmpty() + where termitem.ProjectId == this.CurrUser.LoginProjectId + && termitem.InspectedUser == this.CurrUser.UserId + group termitem by new { termitem.TermItemId, termitem.SubInspectId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName,termitem.InspectedUser, termitem.InspectionResults, termitem.InspectionIllustrate, termitem.Contractor, termitem.Owner, termitem.ProcessPatent, termitem.ContractorIsPass, termitem.OwnerIsPass, termitem.ProcessPatentIsPass, termitem.ContractorRemark, termitem.OwnerRemark, termitem.ProcessPatentRemark, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 } into gt + orderby gt.Key.Sort + select new TermItemBridDto() + { + TermItemId = gt.Key.TermItemId, + SubInspectId = gt.Key.SubInspectId, + ProjectId = gt.Key.ProjectId, + WorkInspectId = gt.Key.WorkInspectId, + WorkInspectName = gt.Key.WorkInspectName, + InspectedUser = gt.Key.InspectedUser, + InspectionResults = gt.Key.InspectionResults, + InspectionIllustrate = gt.Key.InspectionIllustrate, + Contractor = gt.Key.Contractor, + Owner = gt.Key.Owner, + ProcessPatent = gt.Key.ProcessPatent, + ContractorIsPass = gt.Key.ContractorIsPass, + OwnerIsPass = gt.Key.OwnerIsPass, + ProcessPatentIsPass = gt.Key.ProcessPatentIsPass, + ContractorRemark = gt.Key.ContractorRemark, + OwnerRemark = gt.Key.OwnerRemark, + ProcessPatentRemark = gt.Key.ProcessPatentRemark, + Remark = gt.Key.Remark, + AddUser = gt.Key.AddUser, + AddTime = gt.Key.AddTime, + Sort = gt.Key.Sort, + IsTailTerm = gt.Key.IsTailTerm + }; + var list = data.ToList(); + if (istail) + { + JArray mergedData = Grid1.GetMergedData(); + list.ForEach(a => + { + var itemRow = mergedData.FirstOrDefault(x => x.Value("id") == a.TermItemId); + JObject values = itemRow.Value("values"); + var inspectionResults = !string.IsNullOrWhiteSpace(values.Value("InspectionResults")) ? values.Value("InspectionResults") : string.Empty; + if (!string.IsNullOrWhiteSpace(inspectionResults)) + { + a.InspectionResults = int.Parse(inspectionResults); + } + }); + } + Grid1.DataSource = list; + Grid1.DataBind(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + + #endregion + + #region 淇濆瓨 + + /// + /// 淇濆瓨 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + var subInspectId = this.Grid1.Rows[0].DataKeys[2].ToString(); + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && (x.ContractorIsPass != null || x.OwnerIsPass != null || x.ProcessPatentIsPass != null)) > 0) + { + ShowNotify("宸茶繘鍏ユ鏌ヨ〃娴佽浆锛屾棤娉曚慨鏀规鏌ョ粨鏋!", MessageBoxIcon.Warning); + return; + } + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + if (values.Value("InspectionResults") == "0") + { + if (Funs.DB.ProduceRun_InspectTailTerm.Count(x => x.TermItemId == termItemId) == 0) + { + ShowNotify("鏈氳繃鐨勬鏌ラ」璇峰～鍐欏熬椤!", MessageBoxIcon.Warning); + return; + } + } + } + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + //鑾峰彇瀛愮郴缁熶俊鎭 + var model = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId); + if (model != null) + { + model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value("InspectionIllustrate")) ? values.Value("InspectionIllustrate") : string.Empty; + if (!string.IsNullOrWhiteSpace(values.Value("InspectionResults"))) + { + model.InspectionResults = int.Parse(values.Value("InspectionResults")); + } + Funs.DB.SubmitChanges(); + } + } + var subModel = Funs.DB.ProduceRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId); + if (subModel != null) + { + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0) + { + subModel.InspectionIsAllPass = 1; + } + else + { + subModel.InspectionIsAllPass = 0; + } + } + Funs.DB.SubmitChanges(); + BindGrid(); + ShowNotify("淇濆瓨鎴愬姛!"); + } + catch (Exception ex) + { + ShowNotify(ex.Message, MessageBoxIcon.Error); + } + } + + #endregion + + /// + /// 灏鹃」鏁版嵁缁戝畾瀹炰綋 + /// + public class TermItemBridDto + { + /// + /// 涓婚敭 + /// + public string TermItemId { get; set; } + /// + /// 妫鏌ラ」涓婚敭 + /// + public string SubItemId { get; set; } + /// + /// 妫鏌ヨ〃涓婚敭 + /// + public string SubInspectId { get; set; } + /// + /// 宸ヤ綔鍖呬富閿 + /// + public string WorkPackId { get; set; } + /// + /// 椤圭洰涓婚敭 + /// + public string ProjectId { get; set; } + /// + /// 宸ヤ綔鍖呮ā鏉块」涓婚敭 + /// + public string WorkInspectId { get; set; } + /// + /// 妫鏌ヤ簨椤瑰悕绉 + /// + public string WorkInspectName { get; set; } + /// + /// 妫鏌ヤ汉涓婚敭 + /// + public string InspectedUser { get; set; } + /// + /// 妫鏌ョ粨鏋0:鏈氳繃 1:閫氳繃 + /// + public int? InspectionResults { get; set; } + /// + /// 妫鏌ヨ鏄 + /// + public string InspectionIllustrate { get; set; } + /// + /// 鎵垮寘鍟 + /// + public string Contractor { get; set; } + /// + /// 涓氫富 + /// + public string Owner { get; set; } + /// + /// 宸ヨ壓涓撳埄鍟 + /// + public string ProcessPatent { get; set; } + /// + /// 鎵垮寘鍟嗘槸鍚﹂氳繃0/null:鏈氳繃 1:閫氳繃 + /// + public int? ContractorIsPass { get; set; } + /// + /// 涓氫富鏄惁閫氳繃0/null:鏈氳繃 1:閫氳繃 + /// + public int? OwnerIsPass { get; set; } + /// + /// 宸ヨ壓涓撳埄鍟嗘槸鍚﹂氳繃0/null:鏈氳繃 1:閫氳繃 + /// + public int? ProcessPatentIsPass { get; set; } + /// + /// 鎵垮寘鍟嗗娉 + /// + public string ContractorRemark { get; set; } + /// + /// 涓氫富澶囨敞 + /// + public string OwnerRemark { get; set; } + /// + /// 宸ヨ壓涓撳埄鍟嗗娉 + /// + public string ProcessPatentRemark { get; set; } + /// + /// 澶囨敞 + /// + public string Remark { get; set; } + /// + /// 娣诲姞浜 + /// + public string AddUser { get; set; } + /// + /// 娣诲姞鏃ユ湡 + /// + public DateTime? AddTime { get; set; } + /// + /// 鎺掑簭 + /// + public int? Sort { get; set; } + /// + /// 鏄惁瀛樺湪灏鹃」0:涓嶅瓨鍦1:瀛樺湪 + /// + public int IsTailTerm { get; set; } + } + + /// + /// 琛屽唴鎸夐挳浜嬩欢 + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + //灏鹃」鐢宠 + if (e.CommandName == "TailTerm") + { + var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var inspectionResults = Grid1.DataKeys[e.RowIndex][1] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()) : -1; + if (inspectionResults == 0) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "鏂板 - "))); + } + else + { + JArray mergedData = Grid1.GetMergedData(); + var itemRow = mergedData[e.RowIndex].Value("values"); + if (itemRow.Value("InspectionResults") == "0") + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "鏂板 - "))); + } + else + { + ShowNotify("浠呮湭閫氳繃妫鏌ラ」鎵嶅彲濉啓锛", MessageBoxIcon.Warning); + } + } + } + //灏鹃」淇敼 + if (e.CommandName == "TailTermUpdate") + { + var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var inspectionResults = Grid1.DataKeys[e.RowIndex][1] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()) : -1; + if (inspectionResults == 0) + { + var tails = Funs.DB.ProduceRun_InspectTailTerm.Where(x => x.TermItemId == termItemId).ToList(); + if (tails.Count > 0) + { + if (tails.Count(x => x.ApproveState == 0) == 0) + { + ShowNotify("鐢宠鐨勫熬椤归潪鈥滃緟鎻愪氦澶勭悊鈥濈姸鎬侊紝鏃犳硶淇敼锛", MessageBoxIcon.Warning); + return; + } + if (tails.Count(x => x.ApproveState == 0) > 1) + { + string window = $"SelectTailTermList.aspx?TermItemId={termItemId}"; + PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidTailTermId.ClientID) + Window2.GetShowReference(window)); + } + else + { + var tailModel = tails.FirstOrDefault(); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "缂栬緫 - "))); + } + } + else + { + ShowNotify("璇峰～鍐欏熬椤圭敵璇凤紒", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("璇峰～鍐欏熬椤圭敵璇凤紒", MessageBoxIcon.Warning); + } + } + } + + /// + /// 绐楀彛鍏抽棴 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(true); + } + + /// + /// 琛岀粦瀹 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + var isTailTerm = Grid1.DataKeys[e.RowIndex][3].ToString(); + LinkButtonField TailTermUpdate = Grid1.FindColumn("TailTermUpdate") as LinkButtonField; + if (isTailTerm == "0") + { + e.CellCssClasses[TailTermUpdate.ColumnIndex] = "hidethis"; + } + } + + /// + /// 灏鹃」閫夋嫨鍏抽棴 + /// + /// + /// + protected void Window2_Close(object sender, WindowCloseEventArgs e) + { + if (!string.IsNullOrWhiteSpace(hidTailTermId.Text)) + { + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == hidTailTermId.Text); + if (model != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", hidTailTermId.Text, model.TermItemId, "缂栬緫 - "))); + } + } + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx.designer.cs new file mode 100644 index 00000000..231bdd2c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/SubWorkInspect.aspx.designer.cs @@ -0,0 +1,125 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class SubWorkInspect + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hidTailTermId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox hidTailTermId; + + /// + /// txtInspectionIllustrate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtInspectionIllustrate; + + /// + /// ddlInspectionResults 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlInspectionResults; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window2; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx new file mode 100644 index 00000000..ad7ba4ce --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx @@ -0,0 +1,153 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApprove.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.TailTermApprove" %> + + + + + + 璐ㄩ噺宸℃ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx.cs new file mode 100644 index 00000000..6b451a5e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx.cs @@ -0,0 +1,233 @@ +锘縰sing BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class TailTermApprove : PageBase + { + /// + /// 涓婚敭 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 闂鍥剧墖鏄惁鍙紪杈 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 鏁存敼鍥剧墖鏄惁鍙紪杈 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.QuestionEditImg = -1; + this.RectifyEditImg = -1; + //鏁版嵁缁戝畾 + PageInit(); + //澶勭悊鎰忚缁戝畾 + gvHandleBrid(); + } + } + + + /// + /// 缁戝畾鏁版嵁 + /// + public void PageInit() + { + var data = from tail in Funs.DB.ProduceRun_InspectTailTerm + join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId + join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId + join approuser in Funs.DB.Sys_User on tail.ApproveUser equals approuser.UserId + join termitem in Funs.DB.ProduceRun_SubInspectTermItem on tail.TermItemId equals termitem.TermItemId + where tail.TailTermId == this.TailTermId + select new + { + tail.ProjectName, + tail.TailTermCode, + unit.UnitName, + TermItemName = termitem.WorkInspectName, + tail.SubInspectId, + tail.QuestionDesc, + tail.RectifyOpinion, + tail.RectifyTime, + tail.InspectUser, + InspectUserName = inspuser.UserName, + tail.ApproveUser, + ApproveUserName = approuser.UserName, + tail.AdjustCompleteTime + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //椤圭洰鍚嶇О + lblProjectName.Text = model.ProjectName; + //宸℃缂栧彿 + lblTailTermCode.Text = model.TailTermCode; + //鏂藉伐鍗曚綅 + lblConstructionUnit.Text = model.UnitName; + //妫鏌ラ」 + lblTermItemName.Text = model.TermItemName; + //闂鎻忚堪 + lblQuestionDesc.Text = model.QuestionDesc; + //鏁存敼鎰忚 + lblRectifyOpinion.Text = model.RectifyOpinion; + //瑕佹眰鏁存敼瀹屾垚鏃堕棿 + lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //妫鏌ヤ汉 + lblInspectUser.Text = model.InspectUserName; + //瀹℃牳浜 + lblApproveUser.Text = model.ApproveUserName; + hidApproveUserId.Text = model.ApproveUser; + //瀹℃牳鏃堕棿 + lblApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); + } + } + + /// + /// 澶勭悊鎰忚缁戝畾 + /// + public void gvHandleBrid() + { + string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveState when 0 then '澶勭悊閫鍥' when 1 then '澶勭悊瀹屾垚' else '' end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from ProduceRun_InspectTermApproveRecords as a inner join ProduceRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join ProduceRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ApproveType=0 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@TailTermId", this.TailTermId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + gvHandle.DataSource = tb; + gvHandle.DataBind(); + } + + /// + /// 闂鍥剧墖 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 鏁存敼鍥剧墖 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + /// + /// 閫鍥 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 3; + var model = new ProduceRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:澶勭悊璁板綍1:瀹℃牳璁板綍 + model.ApproveType = 1; + //0:閫鍥1:閫氳繃 + model.ApproveState = 0; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.ProduceRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("閫鍥炴垚鍔燂紒", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 閫氳繃 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + //鑾峰彇瀹℃牳椤 + if (Funs.DB.ProduceRun_InspectTailTerm.Count(x => x.TermItemId == tailTerm.TermItemId && x.ApproveState != 5 && x.TailTermId != this.TailTermId) == 0) + { + var termItemModel = Funs.DB.ProduceRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == tailTerm.TermItemId); + if (termItemModel != null) + { + termItemModel.InspectionResults = 1; + var subModel = Funs.DB.ProduceRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == termItemModel.SubInspectId); + if (subModel != null) + { + if (Funs.DB.ProduceRun_SubInspectTermItem.Count(x => x.SubInspectId == termItemModel.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1 && x.TermItemId != termItemModel.TermItemId) == 0) + { + subModel.InspectionIsAllPass = 1; + } + else + { + subModel.InspectionIsAllPass = 0; + } + } + } + } + tailTerm.ApproveState = 5; + var model = new ProduceRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:澶勭悊璁板綍1:瀹℃牳璁板綍 + model.ApproveType = 1; + //0:閫鍥1:閫氳繃 + model.ApproveState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.ProduceRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("瀹℃牳鎴愬姛锛", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 鍏抽棴 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx.designer.cs new file mode 100644 index 00000000..034d5d92 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApprove.aspx.designer.cs @@ -0,0 +1,278 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class TailTermApprove + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblTailTermCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblTailTermCode; + + /// + /// lblConstructionUnit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblConstructionUnit; + + /// + /// lblTermItemName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblTermItemName; + + /// + /// lblQuestionDesc 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRectifyOpinion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblRectifyOpinion; + + /// + /// lblInspectUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblAdjustCompleteTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblAdjustCompleteTime; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// plApprove2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvHandle 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid gvHandle; + + /// + /// lblApproveUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblApproveUser; + + /// + /// hidApproveUserId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hidApproveUserId; + + /// + /// lblApproveTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblApproveTime; + + /// + /// txtApproveOpinion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtApproveOpinion; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx new file mode 100644 index 00000000..395c4e3b --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx @@ -0,0 +1,136 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApproveList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.TailTermApproveList" %> + + + + + + + + + 璐ㄩ噺宸℃瀹℃牳 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx.cs new file mode 100644 index 00000000..e4ec0272 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx.cs @@ -0,0 +1,137 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class TailTermApproveList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //缁戝畾鏁版嵁 + BindGrid(); + } + } + + #region 缁戝畾鏁版嵁 + + /// + /// 鏁版嵁缁戝畾 + /// + public void BindGrid() + { + string strSql = @"select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '寰呮彁浜ゅ鐞' when 1 then '寰呭鐞' when 2 then '澶勭悊閫鍥' when 3 then '瀹℃牳閫鍥' when 4 then '寰呭鏍' when 5 then '瀹℃牳閫氳繃' else '' end) as ApproveStateName,a.AddTime,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from ProduceRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join ProduceRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where 1=1 and a.ProjectId=@projectid and a.ApproveUser=@ApproveUser and a.ApproveState>=3"; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@ApproveUser", this.CurrUser.UserId)); + //瀹℃牳鐘舵 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and a.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 鍒嗛〉 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鍙屽嚮浜嬩欢 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 鍒嗛〉涓嬫媺妗 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 鎸夐挳鍜屾搷浣 + + /// + /// 鍏抽棴寮规 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 瀹℃牳 + /// + protected void btnReview_Click(object sender, EventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 瀹℃牳 + /// + protected void btnMenuApprove_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 4) + { + Alert.ShowInTop("鍙彲瀹℃牳鈥滃緟瀹℃牳鈥濈殑璁板綍锛", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TailTermApprove.aspx?TailTermId={0}", Grid1.SelectedRowID, "瀹℃牳 - "))); + } + + /// + /// 鎼滅储 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx.designer.cs new file mode 100644 index 00000000..489efce3 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermApproveList.aspx.designer.cs @@ -0,0 +1,143 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class TailTermApproveList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlApproveState 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// btnQuery 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnReview 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnReview; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuApprove 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuApprove; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx new file mode 100644 index 00000000..2e85de04 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx @@ -0,0 +1,131 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermHandle.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.TailTermHandle" %> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx.cs new file mode 100644 index 00000000..16f12aab --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx.cs @@ -0,0 +1,193 @@ +锘縰sing BLL; +using Model; +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.Produce +{ + public partial class TailTermHandle : PageBase + { + /// + /// 涓婚敭 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 闂鍥剧墖鏄惁鍙紪杈 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 鏁存敼鍥剧墖鏄惁鍙紪杈 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.QuestionEditImg = -1; + this.RectifyEditImg = 0; + //鏁版嵁缁戝畾 + PageInit(); + } + } + + + /// + /// 缁戝畾鏁版嵁 + /// + public void PageInit() + { + var data = from tail in Funs.DB.ProduceRun_InspectTailTerm + join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId + join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId + join handleuser in Funs.DB.Sys_User on tail.HandleUser equals handleuser.UserId + join termitem in Funs.DB.ProduceRun_SubInspectTermItem on tail.TermItemId equals termitem.TermItemId + where tail.TailTermId == this.TailTermId + select new + { + tail.ProjectName, + tail.TailTermCode, + unit.UnitName, + TermItemName = termitem.WorkInspectName, + tail.SubInspectId, + tail.QuestionDesc, + tail.RectifyOpinion, + tail.RectifyTime, + tail.InspectUser, + InspectUserName = inspuser.UserName, + tail.HandleUser, + HandleUserName = handleuser.UserName, + tail.AdjustCompleteTime + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //椤圭洰鍚嶇О + lblProjectName.Text = model.ProjectName; + //宸℃缂栧彿 + lblTailTermCode.Text = model.TailTermCode; + //鏂藉伐鍗曚綅 + lblConstructionUnit.Text = model.UnitName; + //妫鏌ラ」 + lblTermItemName.Text = model.TermItemName; + //闂鎻忚堪 + lblQuestionDesc.Text = model.QuestionDesc; + //鏁存敼鎰忚 + lblRectifyOpinion.Text = model.RectifyOpinion; + //瑕佹眰鏁存敼瀹屾垚鏃堕棿 + lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //妫鏌ヤ汉 + lblInspectUser.Text = model.InspectUserName; + //澶勭悊浜 + lblApproveUser.Text = model.HandleUserName; + hidApproveUserId.Text = model.HandleUser; + //澶勭悊鏃堕棿 + lblApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); + } + } + + /// + /// 闂鍥剧墖 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 鏁存敼鍥剧墖 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + /// + /// 澶勭悊閫鍥 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 2; + var model = new ProduceRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:澶勭悊璁板綍1:瀹℃牳璁板綍 + model.ApproveType = 0; + //0:閫鍥1:閫氳繃 + model.ApproveState = 0; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.ProduceRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("閫鍥炴垚鍔燂紒", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 澶勭悊閫氳繃骞舵彁浜ゅ鏍 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 4; + var model = new ProduceRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(lblApproveTime.Text); + model.ApproveUser = hidApproveUserId.Text; + //0:澶勭悊璁板綍1:瀹℃牳璁板綍 + model.ApproveType = 0; + //0:閫鍥1:閫氳繃 + model.ApproveState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.ProduceRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("澶勭悊鎴愬姛锛", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 鍏抽棴 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx.designer.cs new file mode 100644 index 00000000..072541a9 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandle.aspx.designer.cs @@ -0,0 +1,260 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class TailTermHandle + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblTailTermCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblTailTermCode; + + /// + /// lblConstructionUnit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblConstructionUnit; + + /// + /// lblTermItemName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblTermItemName; + + /// + /// lblQuestionDesc 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRectifyOpinion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblRectifyOpinion; + + /// + /// lblInspectUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblAdjustCompleteTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblAdjustCompleteTime; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// lblApproveUser 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblApproveUser; + + /// + /// hidApproveUserId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hidApproveUserId; + + /// + /// lblApproveTime 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblApproveTime; + + /// + /// txtApproveOpinion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtApproveOpinion; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx new file mode 100644 index 00000000..16b2c6e3 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx @@ -0,0 +1,137 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermHandleList.aspx.cs" Inherits="FineUIPro.Web.TestRun.Produce.TailTermHandleList" %> + + + + + + + + + 璐ㄩ噺宸℃澶勭悊纭 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx.cs new file mode 100644 index 00000000..c3ad265e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx.cs @@ -0,0 +1,139 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Produce +{ + public partial class TailTermHandleList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //缁戝畾鏁版嵁 + BindGrid(); + } + } + + #region 缁戝畾鏁版嵁 + + /// + /// 鏁版嵁缁戝畾 + /// + public void BindGrid() + { + string strSql = @"select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '寰呮彁浜ゅ鐞' when 1 then '寰呭鐞' when 2 then '澶勭悊閫鍥' when 3 then '瀹℃牳閫鍥' when 4 then '寰呭鏍' when 5 then '瀹℃牳閫氳繃' else '' end) as ApproveStateName,a.AddTime,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from ProduceRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join ProduceRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where 1=1 and a.ProjectId=@projectid and a.HandleUser=@HandleUser and a.ApproveState>=1"; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@HandleUser", this.CurrUser.UserId)); + //瀹℃牳鐘舵 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and a.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 鍒嗛〉 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鍙屽嚮浜嬩欢 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 鍒嗛〉涓嬫媺妗 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 鎸夐挳 + + /// + /// 鍏抽棴寮规 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 澶勭悊 + /// + protected void btnReview_Click(object sender, EventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 澶勭悊 + /// + protected void btnMenuApprove_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇疯嚦灏戦夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + + var passLs = new List() { 1, 3 }; + var model = Funs.DB.ProduceRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (!passLs.Contains(model.ApproveState.Value)) + { + Alert.ShowInTop("鍙彲澶勭悊鈥滃緟澶勭悊鈥濆拰鈥滃鏍搁鍥炩濈殑璁板綍锛", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TailTermHandle.aspx?TailTermId={0}", Grid1.SelectedRowID, "瀹℃牳 - "))); + } + + /// + /// 鎼滅储 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx.designer.cs new file mode 100644 index 00000000..c9d7addf --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Produce/TailTermHandleList.aspx.designer.cs @@ -0,0 +1,143 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Produce +{ + + + public partial class TailTermHandleList + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlApproveState 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// btnQuery 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnReview 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnReview; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuApprove 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuApprove; + } +} diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs index ab63d555..b409036d 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs @@ -44,14 +44,14 @@ namespace FineUIPro.Web.common DateTime d1 = getStartMonth(); DateTime d2 = getEndMonth(); - this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1,d2).ToString().Split('.')[0]; + this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0]; //int wHoursMonth = db.SitePerson_PersonInOutNumber.Where(x => x.InOutDate > DateTime.Now.AddDays(-Convert.ToInt32(DateTime.Now.Date.Day))) // .Max(x => x.WorkHours) ?? 0; //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString(); //瀹夊叏鍩硅绱浜哄憳 - var getTrainRecord = db.EduTrain_TrainRecord.Sum(x=>x.TrainPersonNum)??0; + var getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0; //淇敼锛氬鍔犲崥鏅熸暀鑲蹭腑鐨勪汉鏁 var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count; this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString(); @@ -68,15 +68,20 @@ namespace FineUIPro.Web.common //璐ㄩ噺绠＄悊浜哄憳 int CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson - where x.IsOnJob == true - select x).Count(); + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.IsOnJob == true && y.IsCQMS == true + select x).Count() + + (from x in Funs.DB.SitePerson_Person + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.IsUsed == true && y.IsCQMS == true + select x).Count(); this.divCqmsManageNum.InnerText = CqmsManageNum.ToString(); //璐ㄩ噺鍩硅浜哄憳 DateTime date = DateTime.Now.AddDays(-1); int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson - where x.IsTrain == true - select x).Count(); + where x.IsTrain == true + select x).Count(); divCqmsPxNum.InnerText = CqmsPxNum.ToString(); //璐ㄩ噺闂 @@ -97,10 +102,10 @@ namespace FineUIPro.Web.common int pcount1 = 0; int pcount2 = 0; int pcount3 = 0; - if (acount>0) + if (acount > 0) { - pcount1= allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count(); - pcount2= (from x in Funs.DB.SitePerson_Person where x.IsUsed == true select x).Count(); + pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count(); + pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true select x).Count(); pcount3 = Count3(); } div_zjxmCount.InnerText = pcount1.ToString(); @@ -159,57 +164,57 @@ namespace FineUIPro.Web.common protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null) { decimal cout1 = 0; - - var datetime1 = d1; - var datetime2 = d2; - var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber - - select x; - if (getAllPersonInOutList.Count() > 0) - { - if (datetime1.HasValue) - { - getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate >= datetime1); - } - if (datetime2.HasValue) - { - getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate <= datetime2); - } - if (getAllPersonInOutList.Count() > 0) - { - cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours); - } - } - var getD1 = from x in Funs.DB.Accident_AccidentHandle - join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId - where y.ProjectState == Const.ProjectState_1 - select x; - var getD2 = from x in Funs.DB.Accident_AccidentReport - join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId - where y.ProjectState == Const.ProjectState_1 - select x; + var datetime1 = d1; + var datetime2 = d2; + var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber + select x; + if (getAllPersonInOutList.Count() > 0) + { if (datetime1.HasValue) { - getD1 = getD1.Where(x => x.AccidentDate >= datetime1); - getD2 = getD2.Where(x => x.CompileDate >= datetime1); + getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate >= datetime1); } if (datetime2.HasValue) { - getD1 = getD1.Where(x => x.AccidentDate <= datetime2); - getD2 = getD2.Where(x => x.CompileDate <= datetime2); + getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate <= datetime2); } + if (getAllPersonInOutList.Count() > 0) + { + cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours); + } + } + + var getD1 = from x in Funs.DB.Accident_AccidentHandle + join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + where y.ProjectState == Const.ProjectState_1 + select x; + var getD2 = from x in Funs.DB.Accident_AccidentReport + join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + where y.ProjectState == Const.ProjectState_1 + select x; + + if (datetime1.HasValue) + { + getD1 = getD1.Where(x => x.AccidentDate >= datetime1); + getD2 = getD2.Where(x => x.CompileDate >= datetime1); + } + if (datetime2.HasValue) + { + getD1 = getD1.Where(x => x.AccidentDate <= datetime2); + getD2 = getD2.Where(x => x.CompileDate <= datetime2); + } - if (getD1.Count() > 0) - { - cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0); - } - if (getD2.Count() > 0) - { - cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0); - } + if (getD1.Count() > 0) + { + cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0); + } + if (getD2.Count() > 0) + { + cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0); + } return cout1; } @@ -222,7 +227,7 @@ namespace FineUIPro.Web.common Model.SGGLDB db = Funs.DB; List reports = new List(); var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber - + select x; if (getAllPersonInOutList.Count() > 0) { @@ -240,7 +245,7 @@ namespace FineUIPro.Web.common Model.SitePerson_MonthReport reportItem = new Model.SitePerson_MonthReport { MonthReportId = SQLHelper.GetNewID(), - + CompileDate = Funs.GetNewDateTime(item.Year.ToString() + "-" + item.Month.ToString()), TotalPersonWorkTime = getNow, }; @@ -439,19 +444,20 @@ namespace FineUIPro.Web.common //淇敼鏃ユ湡 2023-10-30 10:43:57 //鍐呭锛氶」鐩悕绉般佸紑宸ユ棩鏈熴佸畬宸ユ棩鏈熴佸墿浣欏ぉ鏁般佽繘搴 - mapStr += item.ProjectId+","; + mapStr += item.ProjectId + ","; mapStr += string.Format("{0:yyyy-MM-dd}", item.StartDate) + ","; if (string.IsNullOrEmpty(item.EndDate.ToString())) { mapStr += ","; } - else { + else + { //鑾峰彇鍓╀綑澶╂暟 var residueDay = DateDiff(DateTime.Now, Convert.ToDateTime(item.EndDate)).ToString(); - mapStr += string.Format("{0:yyyy-MM-dd}", item.EndDate) + ","+residueDay; + mapStr += string.Format("{0:yyyy-MM-dd}", item.EndDate) + "," + residueDay; } - + @@ -508,7 +514,8 @@ namespace FineUIPro.Web.common protected string zlzgl; protected string zgzglDataValue; - protected void getZlwt() { + protected void getZlwt() + { zlallNumber = (from x in Funs.DB.Check_CheckControl where x.CheckDate <= DateTime.Now select x).Count().ToString(); @@ -517,8 +524,8 @@ namespace FineUIPro.Web.common select x).Count(); zlfinishNumber = num2.ToString(); var num3 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State != "7" - select x).Count(); + where x.CheckDate <= DateTime.Now && x.State != "7" + select x).Count(); var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); zlzgl = zgl.ToString(); @@ -532,34 +539,31 @@ namespace FineUIPro.Web.common protected string zlgjzgl; protected string zggjzglDataValue; - protected void getZlgj() { + protected void getZlgj() + { + var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement + select x).Count(); //Check_JointCheck - zlgjallNumber = (from x in Funs.DB.Check_JointCheck - where x.CheckDate <= DateTime.Now - select x).Count().ToString(); + zlgjallNumber = num1.ToString(); - var num2 = (from x in Funs.DB.Check_JointCheck - where x.CheckDate <= DateTime.Now && x.State == BLL.Const.JointCheck_Complete + var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement + where x.IsOnceQualified == true select x).Count(); zlgjfinishNumber = num2.ToString(); - var num3 = (from x in Funs.DB.Check_JointCheck - where x.CheckDate <= DateTime.Now && x.State != BLL.Const.JointCheck_Complete - select x).Count(); - - var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); + var zgl = String.Format("{0:N2}", 100.0 * num2 / num1); zlgjzgl = zgl.ToString(); - zggjzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); + zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); } #endregion #region 鐒婃帴 - protected string hjallNumber="0"; - protected string hjfinishNumber="0"; - protected string hjzgl="0"; + protected string hjallNumber = "0"; + protected string hjfinishNumber = "0"; + protected string hjzgl = "0"; - protected string hjDataValue="0"; + protected string hjDataValue = "0"; protected void getHj() { Model.SingleSerie series = new Model.SingleSerie(); @@ -601,7 +605,7 @@ namespace FineUIPro.Web.common } } - + } #endregion @@ -613,27 +617,28 @@ namespace FineUIPro.Web.common { //Check_JointCheck var znum = (from x in Funs.DB.GJSX - select x).Count(); + select x).Count(); divGjsxzj.InnerHtml = znum.ToString(); //鍒版湡搴斿畬鎴 - var dqnum = (from x in Funs.DB.GJSX where x.CompleteDate<=DateTime.Now + var dqnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now select x).Count().ToString(); divGjsxdq.InnerHtml = dqnum; //鏈噯鐐瑰畬鎴 var wzdnum = (from x in Funs.DB.GJSX where x.CompleteDate <= DateTime.Now - && x.State !="0" - select x).Count().ToString(); + && x.State != "0" + select x).Count().ToString(); divGjsxwzd.InnerHtml = wzdnum; //鍑嗙偣鐜囷紝宸插畬鎴/鎬绘暟*100 - var ywcnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now - && x.State == "0" - select x).Count(); - gjsxZdl = Math.Round((100.0 * ywcnum / znum),2).ToString(); + var ywcnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now + && x.State == "0" + select x).Count(); + gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); } #endregion @@ -671,7 +676,7 @@ namespace FineUIPro.Web.common foreach (var item in list) { ProjectPersonMc += "'" + item.ShortName + "',"; - ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId,DateTime.Now).Count() + "',"; + ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',"; } ProjectPersonMc = ProjectPersonMc.TrimEnd(','); ProjectPersonCount = ProjectPersonCount.TrimEnd(','); @@ -681,7 +686,8 @@ namespace FineUIPro.Web.common #region 杩涘害鎯呭喌 protected string ProjectJd; protected string ProjectMc; - protected void getJd() { + protected void getJd() + { var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList(); foreach (var item in list) { @@ -694,11 +700,12 @@ namespace FineUIPro.Web.common #endregion #region 鏁存敼鏁版嵁 - protected void getZgsj() { + protected void getZgsj() + { div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString(); div_zgywc.InnerHtml = GetGeneralClosedNum().ToString(); div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString(); - div_zgwcl.InnerHtml= String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum()))+"%"; + div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())) + "%"; } /// @@ -731,8 +738,9 @@ namespace FineUIPro.Web.common protected string gdclHead = "椤圭洰绠″瓙绠′欢闃闂鍨墖绱у浐浠"; protected string sbclHead = "椤圭洰閲囪喘閲鍒拌揣閲宸插埌璐х櫨鍒嗘瘮"; - private void getCldh() { - + private void getCldh() + { + //椤圭洰 var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList(); var PipelinList = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M"); @@ -801,7 +809,7 @@ namespace FineUIPro.Web.common #region 璁惧鏉愭枡 sbclHtml += "
"; - pname=item.ShortName; + pname = item.ShortName; if (item.ShortName.Length > 5) { pname = item.ShortName.Substring(0, 5) + "..."; @@ -818,8 +826,9 @@ namespace FineUIPro.Web.common SbcllCgl += 0; Sbdhs += 0; } - else { - SbcllCgl +=Convert.ToDouble(itemCgl.C7); + else + { + SbcllCgl += Convert.ToDouble(itemCgl.C7); Sbdhs += Convert.ToDouble(itemCgl.C9); } } @@ -832,12 +841,13 @@ namespace FineUIPro.Web.common var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%"; sbclHtml += "" + dhbfb + ""; } - else { + else + { sbclHtml += "0%"; } - - + + sbclHtml += "
"; #endregion