diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql b/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql new file mode 100644 index 00000000..21e22af2 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql @@ -0,0 +1,63 @@ +UPDATE [dbo].[Sys_Menu] +SET [MenuName] = N'Σ󣨳Σ󣩹ʩ', +WHERE + CONVERT ( NVARCHAR ( MAX ), [MenuId] ) = N'fd116c94-714b-4b92-a3c9-cc83d358e2b3'; +go + + + +alter table dbo.Comprehensive_MajorPlanApproval + add SchemeType nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL +go + +EXEC sp_addextendedproperty +'MS_Description', N'', +'SCHEMA', N'dbo', +'TABLE', N'Comprehensive_MajorPlanApproval', +'COLUMN', N'SchemeType' +GO +alter table dbo.Comprehensive_MajorPlanApproval + add HazardType nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL +go + +EXEC sp_addextendedproperty +'MS_Description', N'', +'SCHEMA', N'dbo', +'TABLE', N'Comprehensive_MajorPlanApproval', +'COLUMN', N'HazardType' +GO + +alter table dbo.Comprehensive_MajorPlanApproval + add ExpectedTime datetime NULL +go + +EXEC sp_addextendedproperty +'MS_Description', N'Ԥʩ', +'SCHEMA', N'dbo', +'TABLE', N'Comprehensive_MajorPlanApproval', +'COLUMN', N'ExpectedTime' +GO + + +alter table dbo.Comprehensive_MajorPlanApproval + add TrainPersonNum int NULL +go + +EXEC sp_addextendedproperty +'MS_Description', N'ѵ', +'SCHEMA', N'dbo', +'TABLE', N'Comprehensive_MajorPlanApproval', +'COLUMN', N'TrainPersonNum' +GO + + +alter table dbo.Comprehensive_MajorPlanApproval + add States char(1) COLLATE Chinese_PRC_CI_AS NULL +go + +EXEC sp_addextendedproperty +'MS_Description', N'״̬', +'SCHEMA', N'dbo', +'TABLE', N'Comprehensive_MajorPlanApproval', +'COLUMN', N'States' +GO diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index d0efc0c7..26396609 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -122,8 +122,23 @@ namespace BLL newMajorPlanApproval.IsReview = majorPlanApproval.IsReview; newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode; + newMajorPlanApproval.SchemeType = majorPlanApproval.SchemeType; + newMajorPlanApproval.HazardType = majorPlanApproval.HazardType; + newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime; + newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum; + newMajorPlanApproval.States = majorPlanApproval.States; db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval); db.SubmitChanges(); + //查询是否有数据 有则更新 没有则新增 + var largerHazard = BLL.LargerHazardService.GetLargerHazardByHazardId(majorPlanApproval.MajorPlanApprovalId); + if (largerHazard != null) + { + UpdateLargerHazard(majorPlanApproval); + } + else + { + AddLargerHazard(majorPlanApproval); + } } /// @@ -150,9 +165,23 @@ namespace BLL newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId; newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan; newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode; - + newMajorPlanApproval.SchemeType = majorPlanApproval.SchemeType; + newMajorPlanApproval.HazardType = majorPlanApproval.HazardType; + newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime; + newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum; + newMajorPlanApproval.States = majorPlanApproval.States; newMajorPlanApproval.IsReview = majorPlanApproval.IsReview; db.SubmitChanges(); + //查询是否有数据 有则更新 没有则新增 + var largerHazard = BLL.LargerHazardService.GetLargerHazardByHazardId(majorPlanApproval.MajorPlanApprovalId); + if (largerHazard != null) + { + UpdateLargerHazard(majorPlanApproval); + } + else + { + AddLargerHazard(majorPlanApproval); + } } } @@ -174,5 +203,55 @@ namespace BLL db.SubmitChanges(); } } + + #region 同时新增一条到安全管理中的“危大工程施工方案清单” + public static void AddLargerHazard(Model.Comprehensive_MajorPlanApproval majorPlanApproval) + { + Model.SGGLDB db = Funs.DB; + Model.Solution_LargerHazard newLargerHazard = new Model.Solution_LargerHazard + { + HazardId = majorPlanApproval.MajorPlanApprovalId, + HazardCode = majorPlanApproval.PlanCode, + HazardType = majorPlanApproval.HazardType, + ProjectId = majorPlanApproval.ProjectId, + Address = majorPlanApproval.UnitWorkId, + ExpectedTime = majorPlanApproval.ExpectedTime, + IsArgument = majorPlanApproval.IsReview, + RecordTime = majorPlanApproval.ApprovalDate, + RecardMan = majorPlanApproval.CompileMan, + States = majorPlanApproval.States, + TrainPersonNum = majorPlanApproval.TrainPersonNum, + IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false, + }; + + db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard); + db.SubmitChanges(); + ////增加一条编码记录 + BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectLargerHazardListMenuId, newLargerHazard.ProjectId, null, newLargerHazard.HazardId, newLargerHazard.RecordTime); + } + + + public static void UpdateLargerHazard(Model.Comprehensive_MajorPlanApproval majorPlanApproval) + { + Model.SGGLDB db = Funs.DB; + Model.Solution_LargerHazard newLargerHazard = db.Solution_LargerHazard.FirstOrDefault(e => e.HazardId == majorPlanApproval.MajorPlanApprovalId); + if (newLargerHazard != null) + { + newLargerHazard.HazardCode = majorPlanApproval.PlanCode; + newLargerHazard.HazardType = majorPlanApproval.HazardType; + newLargerHazard.ProjectId = majorPlanApproval.ProjectId; + newLargerHazard.Address = majorPlanApproval.UnitWorkId; + newLargerHazard.ExpectedTime = majorPlanApproval.ExpectedTime; + newLargerHazard.IsArgument = majorPlanApproval.IsReview; + newLargerHazard.RecordTime = majorPlanApproval.ApprovalDate; + newLargerHazard.States = majorPlanApproval.States; + newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum; + newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false; + db.SubmitChanges(); + } + } + + + #endregion } } diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index 7756e5e8..0bcf5d6d 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -169,6 +169,12 @@ namespace BLL listToKeyId.Add(toKeyId); listToKeyId.Add(toKeyId + "r"); listToKeyId.Add(toKeyId + "re"); + listToKeyId.Add(toKeyId + "_1"); + listToKeyId.Add(toKeyId + "_2"); + listToKeyId.Add(toKeyId + "_3"); + listToKeyId.Add(toKeyId + "_4"); + listToKeyId.Add(toKeyId + "_5"); + listToKeyId.Add(toKeyId + "_6"); var list = Funs.DB.AttachFile.Where(p => listToKeyId.Contains(p.ToKeyId) && p.MenuId == menuId).ToList(); return list; diff --git a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs index a00b75c9..fd9a14d2 100644 --- a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs +++ b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs @@ -50,6 +50,16 @@ namespace BLL db.SubmitChanges(); ////增加一条编码记录 BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectLargerHazardListMenuId, largerHazard.ProjectId, null, largerHazard.HazardId, largerHazard.RecordTime); + //判断是否有数据 有数据则更新 没有数据则添加 + var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId); + if (majorPlanApproval != null) + { + UpdateMajorPlanApproval(largerHazard); + } + else + { + AddMajorPlanApproval(largerHazard); + } } /// @@ -75,6 +85,16 @@ namespace BLL newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard; newLargerHazard.Descriptions = largerHazard.Descriptions; db.SubmitChanges(); + //判断是否有数据 有数据则更新 没有数据则添加 + var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId); + if (majorPlanApproval != null) + { + UpdateMajorPlanApproval(largerHazard); + } + else + { + AddMajorPlanApproval(largerHazard); + } } } @@ -98,5 +118,52 @@ namespace BLL db.SubmitChanges(); } } + + #region 同时编辑一条到质量管理中的危大（超危大）工程专项施工管理 + private static void AddMajorPlanApproval(Model.Solution_LargerHazard largerHazard) + { + + Model.SGGLDB db = Funs.DB; + Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval(); + newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId; + newMajorPlanApproval.PlanCode = largerHazard.HazardCode; + newMajorPlanApproval.HazardType = largerHazard.HazardType; + newMajorPlanApproval.ProjectId = largerHazard.ProjectId; + newMajorPlanApproval.UnitWorkId = largerHazard.Address; + newMajorPlanApproval.ExpectedTime = largerHazard.ExpectedTime; + newMajorPlanApproval.IsReview = largerHazard.IsArgument; + newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime; + newMajorPlanApproval.CompileMan = largerHazard.RecardMan; + newMajorPlanApproval.States = largerHazard.States; + newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum; + newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程"; + db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval); + db.SubmitChanges(); + } + + + private static void UpdateMajorPlanApproval(Model.Solution_LargerHazard largerHazard) + { + Model.SGGLDB db = Funs.DB; + Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = db.Comprehensive_MajorPlanApproval.FirstOrDefault(e => e.MajorPlanApprovalId == largerHazard.HazardId); + if (newMajorPlanApproval != null) + { + newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId; + newMajorPlanApproval.PlanCode = largerHazard.HazardCode; + newMajorPlanApproval.HazardType = largerHazard.HazardType; + newMajorPlanApproval.ProjectId = largerHazard.ProjectId; + newMajorPlanApproval.UnitWorkId = largerHazard.Address; + newMajorPlanApproval.ExpectedTime = largerHazard.ExpectedTime; + newMajorPlanApproval.IsReview = largerHazard.IsArgument; + newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime; + newMajorPlanApproval.States = largerHazard.States; + newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum; + newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程"; + db.SubmitChanges(); + } + } + + + #endregion } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx index b8eb16d1..d200d5e0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx @@ -50,6 +50,12 @@ + + + + @@ -67,8 +73,8 @@ - + @@ -82,10 +88,17 @@ <%-- --%> - + <%-- --%> + <%-- --%> + <%-- + <%-- Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("MajorPlanApprovalId")) %>' ToolTip="附件查看"> --%> + <%-- --%> + <%-- --%> + - + + @@ -114,6 +127,10 @@ Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" Width="1200px" Height="660px"> + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + +
+
+
+
+ + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs index 2f927704..14bf55ae 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs @@ -34,6 +34,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (!IsPostBack) { GetButtonPower(); + //类型 + BLL.ConstValue.InitConstValueDropDownList(this.drpHazardType, ConstValue.Group_LargerHazardType, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false); BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); @@ -62,6 +64,31 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.drpUnitWorkIds.SelectedValueArray = majorPlanApproval.UnitWorkId.Split(','); } + if (majorPlanApproval.ExpectedTime != null) + { + this.txtExpectedTime.Text = string.Format("{0:yyyy-MM-dd}", majorPlanApproval.ExpectedTime); + } + if (!string.IsNullOrEmpty(majorPlanApproval.SchemeType)) + { + this.drpSchemeType.SelectedValue = majorPlanApproval.SchemeType; + } + if (!string.IsNullOrEmpty(majorPlanApproval.HazardType)) + { + this.drpHazardType.SelectedValue = majorPlanApproval.HazardType; + } + if (!string.IsNullOrEmpty(majorPlanApproval.States)) + { + this.drpStates.SelectedValue = majorPlanApproval.States; + } + + this.AttachUrl1.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_1")); + this.AttachUrl2.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_2")); + this.AttachUrl3.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_3")); + this.AttachUrl4.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_4")); + this.AttachUrl5.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_5")); + this.AttachUrl6.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_6")); + + this.txtTrainPersonNum.Text = majorPlanApproval.TrainPersonNum.HasValue ? majorPlanApproval.TrainPersonNum.ToString() : ""; this.txtAuditMan.Text = majorPlanApproval.AuditMan; this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan; //this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation; @@ -72,6 +99,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { this.txtApprovalDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtExpectedTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); } } } @@ -97,6 +125,79 @@ namespace FineUIPro.Web.CQMS.Comprehensive return; } Model.Comprehensive_MajorPlanApproval majorPlanApproval = new Model.Comprehensive_MajorPlanApproval(); + if (drpHazardType.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择类型！", MessageBoxIcon.Warning); + return; + } + + if (!string.IsNullOrEmpty(this.txtExpectedTime.Text)) + { + majorPlanApproval.ExpectedTime = Convert.ToDateTime(this.txtExpectedTime.Text); + } + else + { + majorPlanApproval.ExpectedTime = DateTime.Now; + } + + if (this.drpSchemeType.SelectedValue != BLL.Const._Null) + { + majorPlanApproval.SchemeType = this.drpSchemeType.SelectedValue; + } + + if (this.drpHazardType.SelectedValue != BLL.Const._Null) + { + majorPlanApproval.HazardType = this.drpHazardType.SelectedValue; + } + + if (this.drpStates.SelectedValue != BLL.Const._Null) + { + majorPlanApproval.States = this.drpStates.SelectedValue; + } + majorPlanApproval.TrainPersonNum = Funs.GetNewInt(this.txtTrainPersonNum.Text.Trim()); + + + if (this.drpStates.SelectedValue != "1") + { + //判断附件是否必传 + if (!returnFj(this.hdAttachUrl.Text + "_1")) + { + Alert.ShowInTop("请上传附件1-论证后的方案", MessageBoxIcon.Warning); + return; + } + + if (!returnFj(this.hdAttachUrl.Text + "_2")) + { + Alert.ShowInTop("请上传附件2-专家论证报告", MessageBoxIcon.Warning); + return; + } + + if (!returnFj(this.hdAttachUrl.Text + "_3")) + { + Alert.ShowInTop("请上传附件3-论证会签到表", MessageBoxIcon.Warning); + return; + } + + if (!returnFj(this.hdAttachUrl.Text + "_4")) + { + Alert.ShowInTop("请上传附件4-论证会会议照片", MessageBoxIcon.Warning); + return; + } + + if (!returnFj(this.hdAttachUrl.Text + "_5")) + { + Alert.ShowInTop("请上传附件5-方案交底记录", MessageBoxIcon.Warning); + return; + } + + if (!returnFj(this.hdAttachUrl.Text + "_6")) + { + Alert.ShowInTop("请上传附件6-方案交底会议照片", MessageBoxIcon.Warning); + return; + } + } + + majorPlanApproval.ProjectId = this.CurrUser.LoginProjectId; if (this.drpUnitId.SelectedValue != BLL.Const._Null) { @@ -171,11 +272,96 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected void btnAttach_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", this.hdAttachUrl.Text, BLL.Const.MajorPlanApprovalMenuId))); + + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format( + "../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", + this.hdAttachUrl.Text+"_1", BLL.Const.MajorPlanApprovalMenuId))); + } + + protected void btnAttach_Click2(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + } + + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format( + "../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", + this.hdAttachUrl.Text+"_2", BLL.Const.MajorPlanApprovalMenuId))); + } + + protected void btnAttach_Click3(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + } + + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format( + "../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", + this.hdAttachUrl.Text+"_3", BLL.Const.MajorPlanApprovalMenuId))); + } + + protected void btnAttach_Click4(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + } + + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format( + "../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", + this.hdAttachUrl.Text+"_4", BLL.Const.MajorPlanApprovalMenuId))); + } + + protected void btnAttach_Click5(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + } + + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format( + "../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", + this.hdAttachUrl.Text+"_5", BLL.Const.MajorPlanApprovalMenuId))); + } + + protected void btnAttach_Click6(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 + { + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval)); + } + + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format( + "../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}", + this.hdAttachUrl.Text+"_6", BLL.Const.MajorPlanApprovalMenuId))); + } + + private bool returnFj(string id) { + bool isT = true; + var model = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id); + if (model==null) + { + return false; + } + return isT; + } + + private string getUrl(string id) + { + string url = string.Empty; + var model = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id); + if (model != null) + { + url = model.AttachUrl; + } + + return url; } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs index 829af817..6b5fd5f8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class MajorPlanApprovalEdit { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class MajorPlanApprovalEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnitId 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// drpCNProfessionalId 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpUnitWorkIds 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// txtPlanCode 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanCode; - + /// /// txtPlanName 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPlanName; - + /// /// txtReviewMan 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtReviewMan; - + /// /// txtApprovalDate 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtApprovalDate; - + /// /// txtAuditMan 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAuditMan; - + /// /// txtApprovalMan 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApprovalMan; - + /// /// txtExpertReviewMan 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtExpertReviewMan; - + /// /// rblIsReview 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsReview; - + /// /// txtRemarkCode 控件。 /// @@ -146,7 +148,52 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtRemarkCode; - + + /// + /// drpSchemeType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSchemeType; + + /// + /// drpHazardType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpHazardType; + + /// + /// txtExpectedTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtExpectedTime; + + /// + /// txtTrainPersonNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtTrainPersonNum; + + /// + /// drpStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpStates; + /// /// Panel2 控件。 /// @@ -155,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -164,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -173,7 +220,250 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// AttachUrl1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// btnAttach1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach1; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// AttachUrl2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl2; + + /// + /// Panel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel4; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// btnAttach2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach2; + + /// + /// ContentPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel3; + + /// + /// AttachUrl3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl3; + + /// + /// Panel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel5; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// btnAttach3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach3; + + /// + /// ContentPanel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel4; + + /// + /// AttachUrl4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl4; + + /// + /// Panel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel6; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// btnAttach4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach4; + + /// + /// ContentPanel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel5; + + /// + /// AttachUrl5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl5; + + /// + /// Panel7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel7; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// btnAttach5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach5; + + /// + /// ContentPanel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel6; + + /// + /// AttachUrl6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl6; + /// /// Toolbar1 控件。 /// @@ -182,7 +472,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -191,7 +481,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -200,7 +490,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx index 7acc56d3..4b245f26 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx @@ -13,7 +13,7 @@ - + @@ -27,9 +27,9 @@ - - - + <%-- --%> + <%-- --%> + @@ -59,15 +59,154 @@ + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + - - + <%-- + <%-- OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> --%> + <%-- --%> x.ToKeyId == id); + if (model==null) + { + return false; + } + return isT; } #endregion @@ -190,7 +310,8 @@ namespace FineUIPro.Web.HSSE.Solution { HazardCode = this.txtLargerHazardCode.Text.Trim(), HazardType = this.drpHazardType.SelectedValue, - Address = this.txtAddress.Text.Trim(), + // Address = this.txtAddress.Text.Trim(), + Address = this.drpAddress.SelectedValue, ExpectedTime = Funs.GetNewDateTime(this.txtExpectedTime.Text.Trim()), IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue), Remark = HttpUtility.HtmlEncode(this.txtRemark.Text.Trim()), diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs index 0188caad..0e831e85 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.Solution { - - - public partial class LargerHazardEdit { - +namespace FineUIPro.Web.HSSE.Solution +{ + + + public partial class LargerHazardEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtLargerHazardCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtLargerHazardCode; - + /// /// drpHazardType 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHazardType; - + /// /// txtExpectedTime 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtExpectedTime; - + /// /// rblIsArgument 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsArgument; - + /// /// txtRecordTime 控件。 /// @@ -83,16 +85,16 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtRecordTime; - + /// - /// txtAddress 控件。 + /// drpAddress 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtAddress; - + protected global::FineUIPro.DropDownList drpAddress; + /// /// rblIsSuperLargerHazard 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsSuperLargerHazard; - + /// /// txtTrainPersonNum 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtTrainPersonNum; - + /// /// drpStates 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpStates; - + /// /// txtDescriptions 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDescriptions; - + /// /// txtRemark 控件。 /// @@ -137,7 +139,277 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HtmlEditor txtRemark; - + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// AttachUrl1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// btnAttach1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach1; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// AttachUrl2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl2; + + /// + /// Panel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel4; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// btnAttach2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach2; + + /// + /// ContentPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel3; + + /// + /// AttachUrl3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl3; + + /// + /// Panel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel5; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// btnAttach3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach3; + + /// + /// ContentPanel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel4; + + /// + /// AttachUrl4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl4; + + /// + /// Panel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel6; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// btnAttach4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach4; + + /// + /// ContentPanel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel5; + + /// + /// AttachUrl5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl5; + + /// + /// Panel7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel7; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// btnAttach5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach5; + + /// + /// ContentPanel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel6; + + /// + /// AttachUrl6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl6; + /// /// Toolbar1 控件。 /// @@ -146,7 +418,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -155,16 +427,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -173,7 +436,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -182,7 +445,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -191,7 +454,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx index a24e663d..ceaff8cd 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx @@ -85,10 +85,15 @@ SortField="TypeName" FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center"> - - + <%-- + <%-- SortField="Address" FieldType="String" HeaderText="地点" TextAlign="Left" --%> + <%-- HeaderTextAlign="Center"> --%> + <%-- --%> + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs index c90f845b..fdd30f63 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.HSSE.Solution { if (!string.IsNullOrEmpty(this.ProjectId)) { - string strSql = @"SELECT LargerHazard.HazardId,LargerHazard.ProjectId,CodeRecords.Code AS HazardCode,LargerHazard.Address,Users.UserName,LargerHazard.ExpectedTime,LargerHazard.RecordTime " + string strSql = @"SELECT LargerHazard.HazardId,LargerHazard.ProjectId,LargerHazard.HazardCode,LargerHazard.Address,Users.UserName,LargerHazard.ExpectedTime,LargerHazard.RecordTime " + @" ,case LargerHazard.States when '1' then '审批完成' when '2' then '作业中' when '3' then '已关闭' @@ -312,5 +312,36 @@ namespace FineUIPro.Web.HSSE.Solution string id = Grid1.SelectedRowID; PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LargerHazardView.aspx?HazardId={0}", id, "查看 - "))); } + #region 格式化字符串 + /// + /// 获取单位工程名称 + /// + /// + /// + protected string ConvertUnitWork(object CarryUnitWorks) + { + string CarryUnitWorkName = string.Empty; + if (CarryUnitWorks != null) + { + string[] Ids = CarryUnitWorks.ToString().Split(','); + foreach (string t in Ids) + { + var UnitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(t); + if (UnitWork != null) + { + CarryUnitWorkName += UnitWork.UnitWorkName + ","; + } + } + } + if (CarryUnitWorkName != string.Empty) + { + return CarryUnitWorkName.Substring(0, CarryUnitWorkName.Length - 1); + } + else + { + return ""; + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.designer.cs index 8b0e8225..e140c15f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.designer.cs @@ -176,6 +176,15 @@ namespace FineUIPro.Web.HSSE.Solution /// protected global::System.Web.UI.WebControls.Label lblNumber; + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + /// /// ToolbarSeparator1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx index e7bf08bf..db88e175 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx @@ -29,8 +29,9 @@ - - + <%-- --%> + <%-- --%> + @@ -68,15 +69,143 @@ + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+
+
+ + + + + - - + <%-- + <%-- OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> --%> + <%-- --%> diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs index eaa1ab83..aece7517 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs @@ -35,6 +35,7 @@ namespace FineUIPro.Web.HSSE.Solution if (!IsPostBack) { btnClose.OnClientClick = ActiveWindow.GetHideReference(); + BLL.UnitWorkService.InitUnitWorkDownList(this.drpAddress, this.CurrUser.LoginProjectId, false); this.HazardId = Request.Params["HazardId"]; var largerHazard = BLL.LargerHazardService.GetLargerHazardByHazardId(this.HazardId); if (largerHazard != null) @@ -44,7 +45,11 @@ namespace FineUIPro.Web.HSSE.Solution { this.txtHazardType.Text = ConstValue.drpConstItemList(ConstValue.Group_LargerHazardType).FirstOrDefault(x => x.ConstValue == largerHazard.HazardType).ConstText; } - this.txtAddress.Text = largerHazard.Address; + if (!string.IsNullOrEmpty(largerHazard.Address)) + { + this.drpAddress.SelectedValue = largerHazard.Address; + } + // this.txtAddress.Text = largerHazard.Address; if (largerHazard.ExpectedTime != null) { this.txtExpectedTime.Text = string.Format("{0:yyyy-MM-dd}", largerHazard.ExpectedTime); @@ -76,6 +81,16 @@ namespace FineUIPro.Web.HSSE.Solution this.drpStates.SelectedValue = largerHazard.States; this.txtDescriptions.Text = largerHazard.Descriptions; this.txtRemark.Text = HttpUtility.HtmlDecode(largerHazard.Remark); + + + this.AttachUrl1.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_1")); + this.AttachUrl2.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_2")); + this.AttachUrl3.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_3")); + this.AttachUrl4.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_4")); + this.AttachUrl5.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_5")); + this.AttachUrl6.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.HazardId + "_6")); + + } ///初始化审核菜单 this.ctlAuditFlow.MenuId = BLL.Const.ProjectLargerHazardListMenuId; @@ -97,6 +112,17 @@ namespace FineUIPro.Web.HSSE.Solution PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}&type=-1", this.HazardId, BLL.Const.ProjectLargerHazardListMenuId))); } } + private string getUrl(string id) + { + string url = string.Empty; + var model = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id); + if (model != null) + { + url = model.AttachUrl; + } + + return url; + } #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs index 6a6da612..b9a4ccf5 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.Solution { - - - public partial class LargerHazardView { - +namespace FineUIPro.Web.HSSE.Solution +{ + + + public partial class LargerHazardView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtLargerHazardCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtLargerHazardCode; - + /// /// txtHazardType 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtHazardType; - + /// /// txtExpectedTime 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtExpectedTime; - + /// /// txtIsArgument 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtIsArgument; - + /// /// txtRecordTime 控件。 /// @@ -83,16 +85,16 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRecordTime; - + /// - /// txtAddress 控件。 + /// drpAddress 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtAddress; - + protected global::FineUIPro.DropDownList drpAddress; + /// /// txtIsSuperLargerHazard 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtIsSuperLargerHazard; - + /// /// txtTrainPersonNum 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtTrainPersonNum; - + /// /// drpStates 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpStates; - + /// /// txtDescriptions 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDescriptions; - + /// /// txtRemark 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HtmlEditor txtRemark; - + /// /// ContentPanel1 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel ContentPanel1; - + /// /// ctlAuditFlow 控件。 /// @@ -155,7 +157,223 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow; - + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// ContentPanel0 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel0; + + /// + /// AttachUrl1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// AttachUrl2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl2; + + /// + /// Panel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel4; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// ContentPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel3; + + /// + /// AttachUrl3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl3; + + /// + /// Panel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel5; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// ContentPanel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel4; + + /// + /// AttachUrl4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl4; + + /// + /// Panel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel6; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// ContentPanel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel5; + + /// + /// AttachUrl5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl5; + + /// + /// Panel7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel7; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// ContentPanel6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel6; + + /// + /// AttachUrl6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl AttachUrl6; + /// /// Toolbar1 控件。 /// @@ -164,7 +382,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -173,16 +391,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - - /// - /// btnAttachUrl 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -191,7 +400,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// @@ -200,7 +409,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx index 30f2e523..08d48f27 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx @@ -101,31 +101,38 @@
-
+
+ +
+
<%= AllNum %>
+
+ +
+
-
<%=CompletedNum %>
+
<%=CompletedNum %>
-
+
-
<%=TrainPersonNum %>
+
<%=TrainPersonNum %>
-
+
-
<%=ConstructionNum %>
+
<%=ConstructionNum %>
-
+
-
<%=FinishedNum %>
+
<%=FinishedNum %>
@@ -135,31 +142,38 @@
-
+
+ +
+
<%= SuperAllNum %>
+
+ +
+
-
<%=SuperCompletedNum %>
+
<%=SuperCompletedNum %>
-
+
-
<%=SuperTrainPersonNum %>
+
<%=SuperTrainPersonNum %>
-
+
-
<%=SuperConstructionNum %>
+
<%=SuperConstructionNum %>
-
+
-
<%=SuperFinishedNum %>
+
<%=SuperFinishedNum %>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 317a1325..e853eead 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -445,6 +445,7 @@ namespace FineUIPro.Web.common #region 风险预警 protected int CompletedNum; + protected int AllNum; protected int ConstructionNum; protected int EarlyWarningCounts; protected int FinishedNum; @@ -456,6 +457,7 @@ namespace FineUIPro.Web.common protected string riskDataRate; protected int SuperCompletedNum; + protected int SuperAllNum; protected int SuperConstructionNum; @@ -667,6 +669,8 @@ namespace FineUIPro.Web.common SuperTrainPersonNum = await SuperTrainPersonNumTask; SuperConstructionNum = await SuperConstructionNumTask; SuperFinishedNum = await SuperFinishedNumTask; + AllNum = await CompletedNumTask + await ConstructionNumTask + await FinishedNumTask; + SuperAllNum = await SuperCompletedNumTask + await SuperConstructionNumTask + await SuperFinishedNumTask; } #endregion 风险预警 diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs index 9cfbe500..613d2150 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.common { - - - public partial class mainProject2 { - +namespace FineUIPro.Web.common +{ + + + public partial class mainProject2 + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// divCqmsPxNum 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCqmsPxNum; - + /// /// div_sgfaSpl 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_sgfaSpl; - + /// /// divSafeWorkTime 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafeWorkTime; - + /// /// divSafeWorkTimeMonth 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafeWorkTimeMonth; - + /// /// divSafePersonNum 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafePersonNum; - + /// /// divSafeManagePersonNum 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSafeManagePersonNum; - + /// /// divWS 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWS; - + /// /// div_zgsj 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgsj; - + /// /// div_zgywc 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgywc; - + /// /// div_zgwwc 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgwwc; - + /// /// div_zgwcl 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zgwcl; - + /// /// divProjectDays 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectDays; - + /// /// divEndDate 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEndDate; - + /// /// divRemainingDays 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRemainingDays; - + /// /// div_Gzgjsx 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgjsx; - + /// /// div_gjsx 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsx; - + /// /// div_Gzdbsx 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzdbsx; - + /// /// div_dbsx 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsx; - + /// /// div_Gzgrlc 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgrlc; - + /// /// div_grlc 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_grlc; - + /// /// div_ybrw 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_ybrw; - + /// /// div_gjsxlist 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsxlist; - + /// /// div_dbsxlist 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsxlist; - + /// /// div_xcrs 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_xcrs; - + /// /// div_zyxcrs 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_zyxcrs; - + /// /// div_glxcrs 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_glxcrs; - + /// /// hiddenUrl 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlInputHidden hiddenUrl; - + /// /// btnShowWindows 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.common { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnShowWindows; - + /// /// Window1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index ec01dcfb..8a53853e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1961,15 +1961,6 @@ namespace Model partial void InsertProject_Sys_Set(Project_Sys_Set instance); partial void UpdateProject_Sys_Set(Project_Sys_Set instance); partial void DeleteProject_Sys_Set(Project_Sys_Set instance); - partial void InsertProject_Wbsconstruct(Project_Wbsconstruct instance); - partial void UpdateProject_Wbsconstruct(Project_Wbsconstruct instance); - partial void DeleteProject_Wbsconstruct(Project_Wbsconstruct instance); - partial void InsertProject_Wbsconstruct_Construct(Project_Wbsconstruct_Construct instance); - partial void UpdateProject_Wbsconstruct_Construct(Project_Wbsconstruct_Construct instance); - partial void DeleteProject_Wbsconstruct_Construct(Project_Wbsconstruct_Construct instance); - partial void InsertProject_Wbsconstruct_Package(Project_Wbsconstruct_Package instance); - partial void UpdateProject_Wbsconstruct_Package(Project_Wbsconstruct_Package instance); - partial void DeleteProject_Wbsconstruct_Package(Project_Wbsconstruct_Package instance); partial void InsertProjectAccident_AccidentAnalysis(ProjectAccident_AccidentAnalysis instance); partial void UpdateProjectAccident_AccidentAnalysis(ProjectAccident_AccidentAnalysis instance); partial void DeleteProjectAccident_AccidentAnalysis(ProjectAccident_AccidentAnalysis instance); @@ -7975,30 +7966,6 @@ namespace Model } } - public System.Data.Linq.Table Project_Wbsconstruct - { - get - { - return this.GetTable(); - } - } - - public System.Data.Linq.Table Project_Wbsconstruct_Construct - { - get - { - return this.GetTable(); - } - } - - public System.Data.Linq.Table Project_Wbsconstruct_Package - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table ProjectAccident_AccidentAnalysis { get @@ -62836,6 +62803,8 @@ namespace Model private EntityRef _Base_Project; + private EntityRef _Technique_CheckItemSet; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -62887,6 +62856,7 @@ namespace Model public Check_CheckSpecial() { this._Base_Project = default(EntityRef); + this._Technique_CheckItemSet = default(EntityRef); OnCreated(); } @@ -63205,6 +63175,10 @@ namespace Model { if ((this._CheckItemSetId != value)) { + if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnCheckItemSetIdChanging(value); this.SendPropertyChanging(); this._CheckItemSetId = value; @@ -63348,6 +63322,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)] + public Technique_CheckItemSet Technique_CheckItemSet + { + get + { + return this._Technique_CheckItemSet.Entity; + } + set + { + Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity; + if (((previousValue != value) + || (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Technique_CheckItemSet.Entity = null; + previousValue.Check_CheckSpecial.Remove(this); + } + this._Technique_CheckItemSet.Entity = value; + if ((value != null)) + { + value.Check_CheckSpecial.Add(this); + this._CheckItemSetId = value.CheckItemSetId; + } + else + { + this._CheckItemSetId = default(string); + } + this.SendPropertyChanged("Technique_CheckItemSet"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -98478,6 +98486,16 @@ namespace Model private System.Nullable _RemarkCode; + private string _SchemeType; + + private string _HazardType; + + private System.Nullable _ExpectedTime; + + private System.Nullable _TrainPersonNum; + + private string _States; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -98526,6 +98544,16 @@ namespace Model partial void OnIsReviewChanged(); partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); + partial void OnSchemeTypeChanging(string value); + partial void OnSchemeTypeChanged(); + partial void OnHazardTypeChanging(string value); + partial void OnHazardTypeChanged(); + partial void OnExpectedTimeChanging(System.Nullable value); + partial void OnExpectedTimeChanged(); + partial void OnTrainPersonNumChanging(System.Nullable value); + partial void OnTrainPersonNumChanged(); + partial void OnStatesChanging(string value); + partial void OnStatesChanged(); #endregion public Comprehensive_MajorPlanApproval() @@ -98909,6 +98937,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SchemeType", DbType="NVarChar(50)")] + public string SchemeType + { + get + { + return this._SchemeType; + } + set + { + if ((this._SchemeType != value)) + { + this.OnSchemeTypeChanging(value); + this.SendPropertyChanging(); + this._SchemeType = value; + this.SendPropertyChanged("SchemeType"); + this.OnSchemeTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardType", DbType="NVarChar(50)")] + public string HazardType + { + get + { + return this._HazardType; + } + set + { + if ((this._HazardType != value)) + { + this.OnHazardTypeChanging(value); + this.SendPropertyChanging(); + this._HazardType = value; + this.SendPropertyChanged("HazardType"); + this.OnHazardTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExpectedTime", DbType="DateTime")] + public System.Nullable ExpectedTime + { + get + { + return this._ExpectedTime; + } + set + { + if ((this._ExpectedTime != value)) + { + this.OnExpectedTimeChanging(value); + this.SendPropertyChanging(); + this._ExpectedTime = value; + this.SendPropertyChanged("ExpectedTime"); + this.OnExpectedTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainPersonNum", DbType="Int")] + public System.Nullable TrainPersonNum + { + get + { + return this._TrainPersonNum; + } + set + { + if ((this._TrainPersonNum != value)) + { + this.OnTrainPersonNumChanging(value); + this.SendPropertyChanging(); + this._TrainPersonNum = value; + this.SendPropertyChanged("TrainPersonNum"); + this.OnTrainPersonNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")] + public string States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_MajorPlanApproval_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -102085,7 +102213,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(500)")] public string UnitWorkId { get @@ -140101,6 +140229,8 @@ namespace Model private System.Nullable _State; + private string _DriverSubNames; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -140137,6 +140267,8 @@ namespace Model partial void OnSubcontractingTypesChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); + partial void OnDriverSubNamesChanging(string value); + partial void OnDriverSubNamesChanged(); #endregion public DriverSub_DriverSubPlan() @@ -140434,6 +140566,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubNames", DbType="VarChar(100)")] + public string DriverSubNames + { + get + { + return this._DriverSubNames; + } + set + { + if ((this._DriverSubNames != value)) + { + this.OnDriverSubNamesChanging(value); + this.SendPropertyChanging(); + this._DriverSubNames = value; + this.SendPropertyChanged("DriverSubNames"); + this.OnDriverSubNamesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -217383,7 +217535,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceName", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceName", DbType="NChar(10)")] public string InterFaceName { get @@ -217423,7 +217575,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceMehtod", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceMehtod", DbType="NChar(10)")] public string InterFaceMehtod { get @@ -284488,7 +284640,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -284502,18 +284654,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + + private string _SubInspectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -284530,8 +284684,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -284544,18 +284698,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -284603,7 +284759,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(100)")] public string ProjectName { get @@ -284683,22 +284839,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId { get { - return this._SubInspectId; + return this._QuestionTechnologyId; } set { - if ((this._SubInspectId != value)) + if ((this._QuestionTechnologyId != value)) { - this.OnSubInspectIdChanging(value); + this.OnQuestionTechnologyIdChanging(value); this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); } } } @@ -284823,26 +284979,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -284863,26 +284999,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -284943,6 +285059,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -284984,14 +285160,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -285010,14 +285186,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -285165,26 +285341,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -285245,6 +285401,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -286177,7 +286353,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -286300,6 +286476,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -286308,20 +286490,6 @@ namespace Model private string _Owner; - private System.Nullable _InspectionIsAllPass; - - private System.Nullable _SubcontractorIsAllPass; - - private System.Nullable _ContractorIsAllPass; - - private System.Nullable _SupervisionIsAllPass; - - private System.Nullable _OwnerIsAllPass; - - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; - private System.Nullable _SubcontractorAllPassData; private System.Nullable _ContractorAllPassData; @@ -286354,11 +286522,19 @@ namespace Model private string _UnifyWanderAboutOpinion; - private System.Nullable _InspectTime; + private System.Nullable _InspectionIsAllPass; - private string _AddUser; + private System.Nullable _WorkPackType; - private System.Nullable _AddTime; + private string _PropertyTechnologyId; + + private System.Nullable _SubcontractorIsAllPass; + + private System.Nullable _ContractorIsAllPass; + + private System.Nullable _SupervisionIsAllPass; + + private System.Nullable _OwnerIsAllPass; #region 可扩展性方法定义 partial void OnLoaded(); @@ -286380,6 +286556,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -286388,20 +286570,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnInspectionIsAllPassChanging(System.Nullable value); - partial void OnInspectionIsAllPassChanged(); - partial void OnSubcontractorIsAllPassChanging(System.Nullable value); - partial void OnSubcontractorIsAllPassChanged(); - partial void OnContractorIsAllPassChanging(System.Nullable value); - partial void OnContractorIsAllPassChanged(); - partial void OnSupervisionIsAllPassChanging(System.Nullable value); - partial void OnSupervisionIsAllPassChanged(); - partial void OnOwnerIsAllPassChanging(System.Nullable value); - partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -286434,12 +286602,20 @@ namespace Model partial void OnUnifyWanderAboutDataChanged(); partial void OnUnifyWanderAboutOpinionChanging(string value); partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectionIsAllPassChanging(System.Nullable value); + partial void OnInspectionIsAllPassChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnSubcontractorIsAllPassChanging(System.Nullable value); + partial void OnSubcontractorIsAllPassChanged(); + partial void OnContractorIsAllPassChanging(System.Nullable value); + partial void OnContractorIsAllPassChanged(); + partial void OnSupervisionIsAllPassChanging(System.Nullable value); + partial void OnSupervisionIsAllPassChanged(); + partial void OnOwnerIsAllPassChanging(System.Nullable value); + partial void OnOwnerIsAllPassChanged(); #endregion public PreRun_SubInspectTerm() @@ -286607,6 +286783,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -286687,146 +286923,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] - public System.Nullable InspectionIsAllPass - { - get - { - return this._InspectionIsAllPass; - } - set - { - if ((this._InspectionIsAllPass != value)) - { - this.OnInspectionIsAllPassChanging(value); - this.SendPropertyChanging(); - this._InspectionIsAllPass = value; - this.SendPropertyChanged("InspectionIsAllPass"); - this.OnInspectionIsAllPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsAllPass", DbType="Int")] - public System.Nullable SubcontractorIsAllPass - { - get - { - return this._SubcontractorIsAllPass; - } - set - { - if ((this._SubcontractorIsAllPass != value)) - { - this.OnSubcontractorIsAllPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsAllPass = value; - this.SendPropertyChanged("SubcontractorIsAllPass"); - this.OnSubcontractorIsAllPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsAllPass", DbType="Int")] - public System.Nullable ContractorIsAllPass - { - get - { - return this._ContractorIsAllPass; - } - set - { - if ((this._ContractorIsAllPass != value)) - { - this.OnContractorIsAllPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsAllPass = value; - this.SendPropertyChanged("ContractorIsAllPass"); - this.OnContractorIsAllPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsAllPass", DbType="Int")] - public System.Nullable SupervisionIsAllPass - { - get - { - return this._SupervisionIsAllPass; - } - set - { - if ((this._SupervisionIsAllPass != value)) - { - this.OnSupervisionIsAllPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsAllPass = value; - this.SendPropertyChanged("SupervisionIsAllPass"); - this.OnSupervisionIsAllPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsAllPass", DbType="Int")] - public System.Nullable OwnerIsAllPass - { - get - { - return this._OwnerIsAllPass; - } - set - { - if ((this._OwnerIsAllPass != value)) - { - this.OnOwnerIsAllPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsAllPass = value; - this.SendPropertyChanged("OwnerIsAllPass"); - this.OnOwnerIsAllPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType - { - get - { - return this._WorkPackType; - } - set - { - if ((this._WorkPackType != value)) - { - this.OnWorkPackTypeChanging(value); - this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")] public System.Nullable SubcontractorAllPassData { @@ -287147,62 +287243,142 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] + public System.Nullable InspectionIsAllPass { get { - return this._InspectTime; + return this._InspectionIsAllPass; } set { - if ((this._InspectTime != value)) + if ((this._InspectionIsAllPass != value)) { - this.OnInspectTimeChanging(value); + this.OnInspectionIsAllPassChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._InspectionIsAllPass = value; + this.SendPropertyChanged("InspectionIsAllPass"); + this.OnInspectionIsAllPassChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType { get { - return this._AddUser; + return this._WorkPackType; } set { - if ((this._AddUser != value)) + if ((this._WorkPackType != value)) { - this.OnAddUserChanging(value); + this.OnWorkPackTypeChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string PropertyTechnologyId { get { - return this._AddTime; + return this._PropertyTechnologyId; } set { - if ((this._AddTime != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnAddTimeChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsAllPass", DbType="Int")] + public System.Nullable SubcontractorIsAllPass + { + get + { + return this._SubcontractorIsAllPass; + } + set + { + if ((this._SubcontractorIsAllPass != value)) + { + this.OnSubcontractorIsAllPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsAllPass = value; + this.SendPropertyChanged("SubcontractorIsAllPass"); + this.OnSubcontractorIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsAllPass", DbType="Int")] + public System.Nullable ContractorIsAllPass + { + get + { + return this._ContractorIsAllPass; + } + set + { + if ((this._ContractorIsAllPass != value)) + { + this.OnContractorIsAllPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsAllPass = value; + this.SendPropertyChanged("ContractorIsAllPass"); + this.OnContractorIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsAllPass", DbType="Int")] + public System.Nullable SupervisionIsAllPass + { + get + { + return this._SupervisionIsAllPass; + } + set + { + if ((this._SupervisionIsAllPass != value)) + { + this.OnSupervisionIsAllPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsAllPass = value; + this.SendPropertyChanged("SupervisionIsAllPass"); + this.OnSupervisionIsAllPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsAllPass", DbType="Int")] + public System.Nullable OwnerIsAllPass + { + get + { + return this._OwnerIsAllPass; + } + set + { + if ((this._OwnerIsAllPass != value)) + { + this.OnOwnerIsAllPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsAllPass = value; + this.SendPropertyChanged("OwnerIsAllPass"); + this.OnOwnerIsAllPassChanged(); } } } @@ -287270,22 +287446,6 @@ namespace Model private string _Owner; - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -287298,6 +287458,22 @@ namespace Model private System.Nullable _Sort; + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -287338,22 +287514,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -287366,6 +287526,22 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -287733,166 +287909,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -288013,6 +288029,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -289014,8 +289190,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -289026,11 +289200,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -289046,6 +289218,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -289082,8 +289258,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -289094,12 +289268,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -289114,6 +289286,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -289423,26 +289599,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -289543,26 +289699,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -289583,22 +289719,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -289743,6 +289879,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -290455,7 +290631,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -306969,768 +307145,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Wbsconstruct")] - public partial class Project_Wbsconstruct : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _ProjectId; - - private string _ParentId; - - private string _ItemName; - - private string _ItemNum; - - private string _PathCode; - - private System.Nullable _PlanEnd; - - private System.Nullable _PlanStart; - - private System.Nullable _RealityEnd; - - private string _ItemLevel; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(string value); - partial void OnIdChanged(); - partial void OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); - partial void OnParentIdChanging(string value); - partial void OnParentIdChanged(); - partial void OnItemNameChanging(string value); - partial void OnItemNameChanged(); - partial void OnItemNumChanging(string value); - partial void OnItemNumChanged(); - partial void OnPathCodeChanging(string value); - partial void OnPathCodeChanged(); - partial void OnPlanEndChanging(System.Nullable value); - partial void OnPlanEndChanged(); - partial void OnPlanStartChanging(System.Nullable value); - partial void OnPlanStartChanged(); - partial void OnRealityEndChanging(System.Nullable value); - partial void OnRealityEndChanged(); - partial void OnItemLevelChanging(string value); - partial void OnItemLevelChanged(); - #endregion - - public Project_Wbsconstruct() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] - public string ProjectId - { - get - { - return this._ProjectId; - } - set - { - if ((this._ProjectId != value)) - { - this.OnProjectIdChanging(value); - this.SendPropertyChanging(); - this._ProjectId = value; - this.SendPropertyChanged("ProjectId"); - this.OnProjectIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="NVarChar(50)")] - public string ParentId - { - get - { - return this._ParentId; - } - set - { - if ((this._ParentId != value)) - { - this.OnParentIdChanging(value); - this.SendPropertyChanging(); - this._ParentId = value; - this.SendPropertyChanged("ParentId"); - this.OnParentIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemName", DbType="NVarChar(50)")] - public string ItemName - { - get - { - return this._ItemName; - } - set - { - if ((this._ItemName != value)) - { - this.OnItemNameChanging(value); - this.SendPropertyChanging(); - this._ItemName = value; - this.SendPropertyChanged("ItemName"); - this.OnItemNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemNum", DbType="NVarChar(50)")] - public string ItemNum - { - get - { - return this._ItemNum; - } - set - { - if ((this._ItemNum != value)) - { - this.OnItemNumChanging(value); - this.SendPropertyChanging(); - this._ItemNum = value; - this.SendPropertyChanged("ItemNum"); - this.OnItemNumChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathCode", DbType="NVarChar(50)")] - public string PathCode - { - get - { - return this._PathCode; - } - set - { - if ((this._PathCode != value)) - { - this.OnPathCodeChanging(value); - this.SendPropertyChanging(); - this._PathCode = value; - this.SendPropertyChanged("PathCode"); - this.OnPathCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")] - public System.Nullable PlanEnd - { - get - { - return this._PlanEnd; - } - set - { - if ((this._PlanEnd != value)) - { - this.OnPlanEndChanging(value); - this.SendPropertyChanging(); - this._PlanEnd = value; - this.SendPropertyChanged("PlanEnd"); - this.OnPlanEndChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStart", DbType="DateTime")] - public System.Nullable PlanStart - { - get - { - return this._PlanStart; - } - set - { - if ((this._PlanStart != value)) - { - this.OnPlanStartChanging(value); - this.SendPropertyChanging(); - this._PlanStart = value; - this.SendPropertyChanged("PlanStart"); - this.OnPlanStartChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")] - public System.Nullable RealityEnd - { - get - { - return this._RealityEnd; - } - set - { - if ((this._RealityEnd != value)) - { - this.OnRealityEndChanging(value); - this.SendPropertyChanging(); - this._RealityEnd = value; - this.SendPropertyChanged("RealityEnd"); - this.OnRealityEndChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemLevel", DbType="NVarChar(50)")] - public string ItemLevel - { - get - { - return this._ItemLevel; - } - set - { - if ((this._ItemLevel != value)) - { - this.OnItemLevelChanging(value); - this.SendPropertyChanging(); - this._ItemLevel = value; - this.SendPropertyChanged("ItemLevel"); - this.OnItemLevelChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Wbsconstruct_Construct")] - public partial class Project_Wbsconstruct_Construct : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _WorkPackageId; - - private string _Name; - - private System.Nullable _PlanEnd; - - private System.Nullable _RealityEnd; - - private string _CheckIndex; - - private System.Nullable _Check37curPercent; - - private System.Nullable _Check37Percent; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(string value); - partial void OnIdChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); - partial void OnNameChanging(string value); - partial void OnNameChanged(); - partial void OnPlanEndChanging(System.Nullable value); - partial void OnPlanEndChanged(); - partial void OnRealityEndChanging(System.Nullable value); - partial void OnRealityEndChanged(); - partial void OnCheckIndexChanging(string value); - partial void OnCheckIndexChanged(); - partial void OnCheck37curPercentChanging(System.Nullable value); - partial void OnCheck37curPercentChanged(); - partial void OnCheck37PercentChanging(System.Nullable value); - partial void OnCheck37PercentChanged(); - #endregion - - public Project_Wbsconstruct_Construct() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] - public string Name - { - get - { - return this._Name; - } - set - { - if ((this._Name != value)) - { - this.OnNameChanging(value); - this.SendPropertyChanging(); - this._Name = value; - this.SendPropertyChanged("Name"); - this.OnNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")] - public System.Nullable PlanEnd - { - get - { - return this._PlanEnd; - } - set - { - if ((this._PlanEnd != value)) - { - this.OnPlanEndChanging(value); - this.SendPropertyChanging(); - this._PlanEnd = value; - this.SendPropertyChanged("PlanEnd"); - this.OnPlanEndChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")] - public System.Nullable RealityEnd - { - get - { - return this._RealityEnd; - } - set - { - if ((this._RealityEnd != value)) - { - this.OnRealityEndChanging(value); - this.SendPropertyChanging(); - this._RealityEnd = value; - this.SendPropertyChanged("RealityEnd"); - this.OnRealityEndChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckIndex", DbType="NVarChar(50)")] - public string CheckIndex - { - get - { - return this._CheckIndex; - } - set - { - if ((this._CheckIndex != value)) - { - this.OnCheckIndexChanging(value); - this.SendPropertyChanging(); - this._CheckIndex = value; - this.SendPropertyChanged("CheckIndex"); - this.OnCheckIndexChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Check37curPercent", DbType="Float")] - public System.Nullable Check37curPercent - { - get - { - return this._Check37curPercent; - } - set - { - if ((this._Check37curPercent != value)) - { - this.OnCheck37curPercentChanging(value); - this.SendPropertyChanging(); - this._Check37curPercent = value; - this.SendPropertyChanged("Check37curPercent"); - this.OnCheck37curPercentChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Check37Percent", DbType="Float")] - public System.Nullable Check37Percent - { - get - { - return this._Check37Percent; - } - set - { - if ((this._Check37Percent != value)) - { - this.OnCheck37PercentChanging(value); - this.SendPropertyChanging(); - this._Check37Percent = value; - this.SendPropertyChanged("Check37Percent"); - this.OnCheck37PercentChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Wbsconstruct_Package")] - public partial class Project_Wbsconstruct_Package : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _WorkPackageCode; - - private string _WorkPackageName; - - private System.Nullable _PlanQuantities; - - private System.Nullable _TotalNum; - - private System.Nullable _CurNum; - - private System.Nullable _CurPercent; - - private System.Nullable _PercentTotal; - - private System.Nullable _CreateTime; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(string value); - partial void OnIdChanged(); - partial void OnWorkPackageCodeChanging(string value); - partial void OnWorkPackageCodeChanged(); - partial void OnWorkPackageNameChanging(string value); - partial void OnWorkPackageNameChanged(); - partial void OnPlanQuantitiesChanging(System.Nullable value); - partial void OnPlanQuantitiesChanged(); - partial void OnTotalNumChanging(System.Nullable value); - partial void OnTotalNumChanged(); - partial void OnCurNumChanging(System.Nullable value); - partial void OnCurNumChanged(); - partial void OnCurPercentChanging(System.Nullable value); - partial void OnCurPercentChanged(); - partial void OnPercentTotalChanging(System.Nullable value); - partial void OnPercentTotalChanged(); - partial void OnCreateTimeChanging(System.Nullable value); - partial void OnCreateTimeChanged(); - #endregion - - public Project_Wbsconstruct_Package() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageCode", DbType="NVarChar(50)")] - public string WorkPackageCode - { - get - { - return this._WorkPackageCode; - } - set - { - if ((this._WorkPackageCode != value)) - { - this.OnWorkPackageCodeChanging(value); - this.SendPropertyChanging(); - this._WorkPackageCode = value; - this.SendPropertyChanged("WorkPackageCode"); - this.OnWorkPackageCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(50)")] - public string WorkPackageName - { - get - { - return this._WorkPackageName; - } - set - { - if ((this._WorkPackageName != value)) - { - this.OnWorkPackageNameChanging(value); - this.SendPropertyChanging(); - this._WorkPackageName = value; - this.SendPropertyChanged("WorkPackageName"); - this.OnWorkPackageNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanQuantities", DbType="Decimal(18,2)")] - public System.Nullable PlanQuantities - { - get - { - return this._PlanQuantities; - } - set - { - if ((this._PlanQuantities != value)) - { - this.OnPlanQuantitiesChanging(value); - this.SendPropertyChanging(); - this._PlanQuantities = value; - this.SendPropertyChanged("PlanQuantities"); - this.OnPlanQuantitiesChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalNum", DbType="Decimal(18,2)")] - public System.Nullable TotalNum - { - get - { - return this._TotalNum; - } - set - { - if ((this._TotalNum != value)) - { - this.OnTotalNumChanging(value); - this.SendPropertyChanging(); - this._TotalNum = value; - this.SendPropertyChanged("TotalNum"); - this.OnTotalNumChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CurNum", DbType="Decimal(18,2)")] - public System.Nullable CurNum - { - get - { - return this._CurNum; - } - set - { - if ((this._CurNum != value)) - { - this.OnCurNumChanging(value); - this.SendPropertyChanging(); - this._CurNum = value; - this.SendPropertyChanged("CurNum"); - this.OnCurNumChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CurPercent", DbType="Float")] - public System.Nullable CurPercent - { - get - { - return this._CurPercent; - } - set - { - if ((this._CurPercent != value)) - { - this.OnCurPercentChanging(value); - this.SendPropertyChanging(); - this._CurPercent = value; - this.SendPropertyChanged("CurPercent"); - this.OnCurPercentChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PercentTotal", DbType="Float")] - public System.Nullable PercentTotal - { - get - { - return this._PercentTotal; - } - set - { - if ((this._PercentTotal != value)) - { - this.OnPercentTotalChanging(value); - this.SendPropertyChanging(); - this._PercentTotal = value; - this.SendPropertyChanged("PercentTotal"); - this.OnPercentTotalChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")] - public System.Nullable CreateTime - { - get - { - return this._CreateTime; - } - set - { - if ((this._CreateTime != value)) - { - this.OnCreateTimeChanging(value); - this.SendPropertyChanging(); - this._CreateTime = value; - this.SendPropertyChanged("CreateTime"); - this.OnCreateTimeChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProjectAccident_AccidentAnalysis")] public partial class ProjectAccident_AccidentAnalysis : INotifyPropertyChanging, INotifyPropertyChanged { @@ -327870,7 +327284,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContentText", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContentText", DbType="NVarChar(1000)")] public string ContentText { get @@ -348916,7 +348330,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CsUsers", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CsUsers", DbType="NVarChar(2000)")] public string CsUsers { get @@ -380520,6 +379934,8 @@ namespace Model private System.Nullable _IsBuiltIn; + private EntitySet _Check_CheckSpecial; + private EntitySet _Technique_CheckItemDetail; #region 可扩展性方法定义 @@ -380546,6 +379962,7 @@ namespace Model public Technique_CheckItemSet() { + this._Check_CheckSpecial = new EntitySet(new Action(this.attach_Check_CheckSpecial), new Action(this.detach_Check_CheckSpecial)); this._Technique_CheckItemDetail = new EntitySet(new Action(this.attach_Technique_CheckItemDetail), new Action(this.detach_Technique_CheckItemDetail)); OnCreated(); } @@ -380710,6 +380127,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] + public EntitySet Check_CheckSpecial + { + get + { + return this._Check_CheckSpecial; + } + set + { + this._Check_CheckSpecial.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] public EntitySet Technique_CheckItemDetail { @@ -380743,6 +380173,18 @@ namespace Model } } + private void attach_Check_CheckSpecial(Check_CheckSpecial entity) + { + this.SendPropertyChanging(); + entity.Technique_CheckItemSet = this; + } + + private void detach_Check_CheckSpecial(Check_CheckSpecial entity) + { + this.SendPropertyChanging(); + entity.Technique_CheckItemSet = null; + } + private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity) { this.SendPropertyChanging(); @@ -404808,8 +404250,12 @@ namespace Model private string _Comments; + private string _Num_NO; + private string _System_No; + private string _Sub_Sys_No; + private string _Cat; private string _Raised_By; @@ -404830,6 +404276,8 @@ namespace Model private string _PIC_WUH; + private string _Correction_Action; + private System.Nullable _Actual_Date; private string _Cleared_By; @@ -404848,12 +404296,6 @@ namespace Model private string _Remark; - private string _Sub_Sys_No; - - private string _Num_NO; - - private string _Correction_Action; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -404890,8 +404332,12 @@ namespace Model partial void OnPUNCH_ITEM_STATUSChanged(); partial void OnCommentsChanging(string value); partial void OnCommentsChanged(); + partial void OnNum_NOChanging(string value); + partial void OnNum_NOChanged(); partial void OnSystem_NoChanging(string value); partial void OnSystem_NoChanged(); + partial void OnSub_Sys_NoChanging(string value); + partial void OnSub_Sys_NoChanged(); partial void OnCatChanging(string value); partial void OnCatChanged(); partial void OnRaised_ByChanging(string value); @@ -404912,6 +404358,8 @@ namespace Model partial void OnPICChanged(); partial void OnPIC_WUHChanging(string value); partial void OnPIC_WUHChanged(); + partial void OnCorrection_ActionChanging(string value); + partial void OnCorrection_ActionChanged(); partial void OnActual_DateChanging(System.Nullable value); partial void OnActual_DateChanged(); partial void OnCleared_ByChanging(string value); @@ -404930,12 +404378,6 @@ namespace Model partial void OnStatusChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); - partial void OnSub_Sys_NoChanging(string value); - partial void OnSub_Sys_NoChanged(); - partial void OnNum_NOChanging(string value); - partial void OnNum_NOChanged(); - partial void OnCorrection_ActionChanging(string value); - partial void OnCorrection_ActionChanged(); #endregion public Transfer_PunchlistFrom() @@ -405263,6 +404705,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")] + public string Num_NO + { + get + { + return this._Num_NO; + } + set + { + if ((this._Num_NO != value)) + { + this.OnNum_NOChanging(value); + this.SendPropertyChanging(); + this._Num_NO = value; + this.SendPropertyChanged("Num_NO"); + this.OnNum_NOChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")] public string System_No { @@ -405283,6 +404745,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] + public string Sub_Sys_No + { + get + { + return this._Sub_Sys_No; + } + set + { + if ((this._Sub_Sys_No != value)) + { + this.OnSub_Sys_NoChanging(value); + this.SendPropertyChanging(); + this._Sub_Sys_No = value; + this.SendPropertyChanged("Sub_Sys_No"); + this.OnSub_Sys_NoChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")] public string Cat { @@ -405483,6 +404965,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")] + public string Correction_Action + { + get + { + return this._Correction_Action; + } + set + { + if ((this._Correction_Action != value)) + { + this.OnCorrection_ActionChanging(value); + this.SendPropertyChanging(); + this._Correction_Action = value; + this.SendPropertyChanged("Correction_Action"); + this.OnCorrection_ActionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")] public System.Nullable Actual_Date { @@ -405663,66 +405165,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] - public string Sub_Sys_No - { - get - { - return this._Sub_Sys_No; - } - set - { - if ((this._Sub_Sys_No != value)) - { - this.OnSub_Sys_NoChanging(value); - this.SendPropertyChanging(); - this._Sub_Sys_No = value; - this.SendPropertyChanged("Sub_Sys_No"); - this.OnSub_Sys_NoChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")] - public string Num_NO - { - get - { - return this._Num_NO; - } - set - { - if ((this._Num_NO != value)) - { - this.OnNum_NOChanging(value); - this.SendPropertyChanging(); - this._Num_NO = value; - this.SendPropertyChanged("Num_NO"); - this.OnNum_NOChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")] - public string Correction_Action - { - get - { - return this._Correction_Action; - } - set - { - if ((this._Correction_Action != value)) - { - this.OnCorrection_ActionChanging(value); - this.SendPropertyChanging(); - this._Correction_Action = value; - this.SendPropertyChanged("Correction_Action"); - this.OnCorrection_ActionChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;