From 475d273bc54fbcce892cdaf5dc3e6e94073bd504 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 30 Apr 2024 09:29:36 +0800 Subject: [PATCH] =?UTF-8?q?20240430=20=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-04-30-bwj.sql | 5 + .../SiteVisaManagementService.cs | 1 + .../DataDistributionEdit.aspx.cs | 16 +- .../Comprehensive/DataReceivingEdit.aspx.cs | 14 +- .../CQMS/Comprehensive/DesignChangeOrder.aspx | 3 + .../Comprehensive/DesignChangeOrder.aspx.cs | 165 ++ .../DesignChangeOrder.aspx.designer.cs | 71 +- .../DesignChangeOrderDataIn.aspx.cs | 106 +- .../Comprehensive/DesignChangeOrderEdit.aspx | 3 +- .../DesignChangeOrderEdit.aspx.cs | 191 +- .../DesignChangeOrderEdit.aspx.designer.cs | 71 +- .../Comprehensive/DesignDetailsEdit.aspx.cs | 14 +- .../Comprehensive/DesignDrawingsEdit.aspx.cs | 16 +- .../InspectionEquipmentEdit.aspx.cs | 16 +- .../InspectionMachineEdit.aspx.cs | 16 +- .../InspectionPersonEdit.aspx.cs | 16 +- .../Comprehensive/NCRManagementEdit.aspx.cs | 14 +- .../Comprehensive/PressurePipeEdit.aspx.cs | 14 +- .../Comprehensive/QualityAccidentEdit.aspx.cs | 16 +- .../Comprehensive/ReviewDrawingsEdit.aspx.cs | 14 +- .../Comprehensive/SiteVisaManagement.aspx | 53 +- .../Comprehensive/SiteVisaManagement.aspx.cs | 166 ++ .../SiteVisaManagement.aspx.designer.cs | 67 +- .../SiteVisaManagementDataIn.aspx.cs | 19 +- .../Comprehensive/SiteVisaManagementEdit.aspx | 1 + .../SiteVisaManagementEdit.aspx.cs | 34 +- .../SiteVisaManagementEdit.aspx.designer.cs | 71 +- .../SpecialEquipmentEdit.aspx.cs | 16 +- SGGL/FineUIPro.Web/ErrLog.txt | 87 + .../File/Excel/CQMS/培训记录模板.xls | Bin 19456 -> 0 bytes .../File/Excel/CQMS/施工技术交底管理模板.xls | Bin 19456 -> 0 bytes .../Excel/DataIn/现场签证管理导入模板.xls | Bin 19968 -> 14848 bytes .../File/Excel/DataIn/设计变更单导入模板.xls | Bin 19968 -> 22016 bytes SGGL/FineUIPro.Web/Web.config | 4 +- SGGL/Model/Model.cs | 1803 ++++++++++------- 35 files changed, 1971 insertions(+), 1132 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-30-bwj.sql delete mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/培训记录模板.xls delete mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/施工技术交底管理模板.xls diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-30-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-30-bwj.sql new file mode 100644 index 00000000..c2a788a4 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-30-bwj.sql @@ -0,0 +1,5 @@ +alter table Comprehensive_DesignChangeOrder alter column RemarkCode int +go +alter table Comprehensive_SiteVisaManagement alter column RemarkCode int +go + diff --git a/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs index caf2ce27..7b0e8685 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs @@ -169,6 +169,7 @@ namespace BLL newSiteVisaManagement.AuditMan = siteVisaMangement.AuditMan; newSiteVisaManagement.Remark = siteVisaMangement.Remark; newSiteVisaManagement.Status = siteVisaMangement.Status; + newSiteVisaManagement.RemarkCode = siteVisaMangement.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs index 8813804e..795f9363 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs @@ -407,17 +407,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataDistribution)); } - var dataDistribution = BLL.DataDistributionService.GetDataDistributionById(this.DataDistributionId); + //var dataDistribution = BLL.DataDistributionService.GetDataDistributionById(this.DataDistributionId); - if (dataDistribution == null || ((dataDistribution.CompileMan == CurrUser.UserId && dataDistribution.Status == BLL.Const.Comprehensive_Compile) || (dataDistribution.CompileMan == CurrUser.UserId && dataDistribution.Status == BLL.Const.Comprehensive_ReCompile))) - { + //if (dataDistribution == null || ((dataDistribution.CompileMan == CurrUser.UserId && dataDistribution.Status == BLL.Const.Comprehensive_Compile) || (dataDistribution.CompileMan == CurrUser.UserId && dataDistribution.Status == BLL.Const.Comprehensive_ReCompile))) + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/DataDistribution&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataDistributionMenuId))); - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/DataDistribution&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataDistributionMenuId))); + //} + //else + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/DataDistribution&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataDistributionMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs index 417a86dc..122c01c4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs @@ -392,14 +392,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceiving)); } Model.Comprehensive_DataReceiving dataReceiving = BLL.DataReceivingService.GetDataReceivingById(this.DataReceivingId); - if (dataReceiving == null || ((dataReceiving.CompileMan == CurrUser.UserId && dataReceiving.Status == BLL.Const.Comprehensive_Compile) || (dataReceiving.CompileMan == CurrUser.UserId && dataReceiving.Status == BLL.Const.Comprehensive_ReCompile))) - { + //if (dataReceiving == null || ((dataReceiving.CompileMan == CurrUser.UserId && dataReceiving.Status == BLL.Const.Comprehensive_Compile) || (dataReceiving.CompileMan == CurrUser.UserId && dataReceiving.Status == BLL.Const.Comprehensive_ReCompile))) + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/DataReceiving&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataReceivingMenuId))); - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/DataReceiving&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataReceivingMenuId))); - } + //} + //else + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/DataReceiving&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataReceivingMenuId))); + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx index 5034d9f5..38d2bc1a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx @@ -39,6 +39,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs index fe407105..71057464 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive { @@ -278,6 +279,170 @@ namespace FineUIPro.Web.Comprehensive } #endregion + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.DesignChangeOrderDataInUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_DesignChangeOrder + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (this.sdrpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == sdrpCNProfessionalId.SelectedValue); + } + if (!string.IsNullOrEmpty(this.stxtContents.Text.Trim())) + { + lists = lists.Where(x => x.Contents.Contains(this.stxtContents.Text.Trim())); + } + if (!string.IsNullOrEmpty(this.txtStarTime.Text.Trim())) + { + lists = lists.Where(x => x.IssuedDate >= Funs.GetNewDateTime(this.txtStarTime.Text.Trim())); + } + if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim())) + { + lists = lists.Where(x => x.IssuedDate <= Funs.GetNewDateTime(this.txtEndTime.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ChangeOrderCode);//变更单号 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + string unitWork = string.Empty; + if (!string.IsNullOrEmpty(item.UnitWorkId)) + { + unitWork = ConvertUnitWork(item.UnitWorkId); + } + cell.SetCellValue(unitWork);//单位工程名称 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ChangeReason);//变更原因 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Contents);//主要内容 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ApprovalDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ApprovalDate) : "");//业主批准日期 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitId)) + { + unitName = ConvertCarryUnit(item.UnitId); + } + cell.SetCellValue(unitName);//接收单位 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ImplementationFrontState);//执行情况 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//施工完成日期 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion + #region 获取按钮权限 /// /// 获取按钮权限 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.designer.cs index 9393d37d..4678ba12 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Comprehensive -{ - - - public partial class DesignChangeOrder - { - +namespace FineUIPro.Web.Comprehensive { + + + public partial class DesignChangeOrder { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// sdrpCNProfessionalId 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList sdrpCNProfessionalId; - + /// /// stxtContents 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox stxtContents; - + /// /// txtStarTime 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + /// /// btnSearch 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 控件。 /// @@ -130,7 +128,16 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label2 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// Label3 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// txtStatus 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label txtStatus; - + /// /// lbtnFileUrl 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// WindowAtt 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs index ad5bb5b3..6e2530d7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs @@ -168,9 +168,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; var cns = from x in Funs.DB.Base_CNProfessional select x; - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x; - for (int i = 0; i < ir; i++) + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString().Trim(); if (!string.IsNullOrEmpty(row0)) @@ -181,22 +184,30 @@ namespace FineUIPro.Web.CQMS.Comprehensive result += (i + 2).ToString() + "," + "专业名称" + "," + "[" + row0 + "]不存在！" + "|"; } } - string row1 = pds.Rows[i][1].ToString(); - if (!string.IsNullOrEmpty(row1)) + else { - var ins = installations.Where(x => x.UnitWorkName == row1.Trim()).FirstOrDefault(); - if (ins == null) - { - result += (i + 2).ToString() + "," + "装置/单元名称" + "," + "[" + row1 + "]不存在！" + "|"; - } + result += (i + 2).ToString() + "," + "专业名称" + "," + "此项为必填项！" + "|"; } - string row2 = pds.Rows[i][2].ToString(); - if (string.IsNullOrEmpty(row2)) + string row1 = pds.Rows[i][1].ToString(); + if (string.IsNullOrEmpty(row1)) { result += (i + 2).ToString() + "," + "变更单号" + "," + "此项为必填项！" + "|"; } + string row2 = pds.Rows[i][2].ToString(); + if (!string.IsNullOrEmpty(row2)) + { + string[] reunit = row2.Split(','); + foreach (string unitWork in reunit) + { + var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|"; + } + } + } string row5 = pds.Rows[i][5].ToString(); if (!string.IsNullOrEmpty(row5)) @@ -233,16 +244,29 @@ namespace FineUIPro.Web.CQMS.Comprehensive var u = units.Where(x => x.UnitName == unit).FirstOrDefault(); if (u == null) { - result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + unit + "]不存在！" + "|"; + result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|"; } } } - string row9 = pds.Rows[i][9].ToString().Trim(); + string row8 = pds.Rows[i][8].ToString().Trim(); + if (!string.IsNullOrEmpty(row8)) + { + if (row8 != "实施中" && row8 != "已完成") + { + result += (i + 2).ToString() + "," + "执行情况" + "," + "[" + row8 + "]错误！" + "|"; + } + } + + string row9 = pds.Rows[i][9].ToString(); if (!string.IsNullOrEmpty(row9)) { - if (row9 != "未实施" && row9 != "进行中" && row9 != "已完成") + try { - result += (i + 2).ToString() + "," + "处理状态" + "," + "[" + row9 + "]错误！" + "|"; + DateTime date = Convert.ToDateTime(row9.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "施工完成日期" + "," + "[" + row9 + "]错误！" + "|"; } } @@ -251,6 +275,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row10); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row10 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -390,13 +425,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; var cns = from x in Funs.DB.Base_CNProfessional select x; - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x; + + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder where x.ProjectId == this.CurrUser.LoginProjectId select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { - var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim()).FirstOrDefault(); + var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][10].ToString().Trim())).FirstOrDefault(); if (oldViewInfo == null) { Model.Comprehensive_DesignChangeOrder Ins = new Model.Comprehensive_DesignChangeOrder(); @@ -405,13 +445,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Ins.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][0].ToString().Trim()).CNProfessionalId; } - - if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim())) + Ins.ChangeOrderCode = pds.Rows[i][1].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim())) { - Ins.UnitWorkId = Funs.DB.WBS_UnitWork.First(e => e.UnitWorkName == pds.Rows[i][1].ToString().Trim()).UnitWorkId; + Ins.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim()); } - - Ins.ChangeOrderCode = pds.Rows[i][2].ToString().Trim(); Ins.ChangeReason = pds.Rows[i][3].ToString().Trim(); Ins.Contents = pds.Rows[i][4].ToString().Trim(); @@ -429,26 +467,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Ins.UnitId = UnitService.GetUnitIds(pds.Rows[i][7].ToString().Trim()); } - Ins.ImplementationFrontState = pds.Rows[i][8].ToString().Trim(); - - string row9 = pds.Rows[i][9].ToString().Trim(); - if (!string.IsNullOrEmpty(row9)) - { - if (row9 == "未实施") - { - Ins.HandleState = "1"; - } - if (row9 == "进行中") - { - Ins.HandleState = "2"; - } - if (row9 == "已完成") - { - Ins.HandleState = "3"; - } - } - Ins.RemarkCode = pds.Rows[i][10].ToString().Trim(); + Ins.CompleteDate = Funs.GetNewDateTime(pds.Rows[i][9].ToString().Trim()); + Ins.RemarkCode = Funs.GetNewInt(pds.Rows[i][10].ToString().Trim()); Ins.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; @@ -467,7 +488,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive #endregion #endregion - #region 下载模板 /// /// 下载模板按钮 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx index 6cdfa08b..0d6fa5ff 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx @@ -21,7 +21,7 @@ - + @@ -63,6 +63,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index 5a8e65c1..8782ad1e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -77,7 +77,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } //this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState; this.drpImplementationFrontState.SelectedValue= designChangeOrder.ImplementationFrontState; - + this.txtRemarkCode.Text = designChangeOrder.RemarkCode.HasValue ? designChangeOrder.RemarkCode.ToString() : ""; var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId); if (currApprove != null) @@ -139,6 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive drpUnitIds.Readonly = true; drpUnitWorks.Readonly = true; this.drpAudit.Readonly = true; + this.txtRemarkCode.Readonly = true; // this.btnAttach.Enabled = false; } @@ -180,85 +181,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } - Model.Comprehensive_DesignChangeOrder designChangeOrder = new Model.Comprehensive_DesignChangeOrder(); - designChangeOrder.ProjectId = this.CurrUser.LoginProjectId; - if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + var q = Funs.DB.Comprehensive_DesignChangeOrder.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignChangeOrderId != this.DesignChangeOrderId || (this.DesignChangeOrderId == null && x.DesignChangeOrderId != null))); + if (q != null) { - designChangeOrder.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - } - designChangeOrder.ChangeOrderCode = this.txtChangeOrderCode.Text.Trim(); - designChangeOrder.ChangeReason = this.txtChangeReason.Text.Trim(); - designChangeOrder.Contents = this.txtContents.Text.Trim(); - designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text); - designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); - designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); - designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designChangeOrder.AuditMan = drpAudit.SelectedValue; - } //审核人 - string unitWorks = string.Empty; - var unitWorksList = this.drpUnitWorks.SelectedValueArray; - foreach (var item in unitWorksList) - { - unitWorks += item + ","; - } - if (!string.IsNullOrEmpty(unitWorks)) - { - unitWorks = unitWorks.Substring(0, unitWorks.LastIndexOf(',')); - } - designChangeOrder.UnitWorkId = unitWorks; - - string unitIds = string.Empty; - var unitLists = this.drpUnitIds.SelectedValueArray; - foreach (var item in unitLists) - { - unitIds += item + ","; - } - if (!string.IsNullOrEmpty(unitIds)) - { - unitIds = unitIds.Substring(0, unitIds.LastIndexOf(',')); - } - designChangeOrder.UnitId = unitIds; - if (string.IsNullOrEmpty(this.DesignChangeOrderId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - designChangeOrder.DesignChangeOrderId = this.hdAttachUrl.Text; - } - else - { - designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); - this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId; - } - - designChangeOrder.CompileMan = this.CurrUser.UserId; - designChangeOrder.CompileDate = DateTime.Now; - designChangeOrder.Status = BLL.Const.Comprehensive_Compile; - BLL.DesignChangeOrderService.AddDesignChangeOrder(designChangeOrder); - } - else - { - designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId; - var model = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault(); - if (model != null) - { - designChangeOrder.Status = model.Status; - } - BLL.DesignChangeOrderService.UpdateDesignChangeOrder(designChangeOrder); - } - - - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } - - - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); return; } Model.Comprehensive_DesignChangeOrder designChangeOrder = new Model.Comprehensive_DesignChangeOrder(); @@ -301,6 +227,95 @@ namespace FineUIPro.Web.CQMS.Comprehensive unitIds = unitIds.Substring(0, unitIds.LastIndexOf(',')); } designChangeOrder.UnitId = unitIds; + designChangeOrder.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + if (string.IsNullOrEmpty(this.DesignChangeOrderId)) + { + if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + { + designChangeOrder.DesignChangeOrderId = this.hdAttachUrl.Text; + } + else + { + designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); + this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId; + } + + designChangeOrder.CompileMan = this.CurrUser.UserId; + designChangeOrder.CompileDate = DateTime.Now; + designChangeOrder.Status = BLL.Const.Comprehensive_Compile; + BLL.DesignChangeOrderService.AddDesignChangeOrder(designChangeOrder); + } + else + { + designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId; + var model = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault(); + if (model != null) + { + designChangeOrder.Status = model.Status; + } + BLL.DesignChangeOrderService.UpdateDesignChangeOrder(designChangeOrder); + } + + + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + return; + } + var q = Funs.DB.Comprehensive_DesignChangeOrder.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignChangeOrderId != this.DesignChangeOrderId || (this.DesignChangeOrderId == null && x.DesignChangeOrderId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } + Model.Comprehensive_DesignChangeOrder designChangeOrder = new Model.Comprehensive_DesignChangeOrder(); + designChangeOrder.ProjectId = this.CurrUser.LoginProjectId; + if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + designChangeOrder.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + } + designChangeOrder.ChangeOrderCode = this.txtChangeOrderCode.Text.Trim(); + designChangeOrder.ChangeReason = this.txtChangeReason.Text.Trim(); + designChangeOrder.Contents = this.txtContents.Text.Trim(); + designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text); + designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); + designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); + designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; + if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + { + designChangeOrder.AuditMan = drpAudit.SelectedValue; + } //审核人 + string unitWorks = string.Empty; + var unitWorksList = this.drpUnitWorks.SelectedValueArray; + foreach (var item in unitWorksList) + { + unitWorks += item + ","; + } + if (!string.IsNullOrEmpty(unitWorks)) + { + unitWorks = unitWorks.Substring(0, unitWorks.LastIndexOf(',')); + } + designChangeOrder.UnitWorkId = unitWorks; + + string unitIds = string.Empty; + var unitLists = this.drpUnitIds.SelectedValueArray; + foreach (var item in unitLists) + { + unitIds += item + ","; + } + if (!string.IsNullOrEmpty(unitIds)) + { + unitIds = unitIds.Substring(0, unitIds.LastIndexOf(',')); + } + designChangeOrder.UnitId = unitIds; + designChangeOrder.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.DesignChangeOrderId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -442,15 +457,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); } - Model.Comprehensive_DesignChangeOrder designChangeOrder = BLL.DesignChangeOrderService.GetDesignChangeOrderById(this.DesignChangeOrderId); - if (designChangeOrder.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/DesignChangeOrder&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignChangeOrderMenuId))); - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/DesignChangeOrder&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignChangeOrderMenuId))); - } + //Model.Comprehensive_DesignChangeOrder designChangeOrder = BLL.DesignChangeOrderService.GetDesignChangeOrderById(this.DesignChangeOrderId); + //if (designChangeOrder.Status == BLL.Const.Comprehensive_Complete) + //{ + //PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/DesignChangeOrder&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignChangeOrderMenuId))); + //} + //else + //{ + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/DesignChangeOrder&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignChangeOrderMenuId))); + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs index 5f560bc1..c47a3c19 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class DesignChangeOrderEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class DesignChangeOrderEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpCNProfessionalId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpUnitWorks 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorks; - + /// /// drpUnitIds 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitIds; - + /// /// txtChangeOrderCode 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtChangeOrderCode; - + /// /// txtChangeReason 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtChangeReason; - + /// /// txtContents 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtContents; - + /// /// txtIssuedDate 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtIssuedDate; - + /// /// txtApprovalDate 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtApprovalDate; - + /// /// drpImplementationFrontState 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpImplementationFrontState; - + /// /// txtCompleteDate 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtCompleteDate; - + /// /// Panel2 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -157,7 +155,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// drpAudit 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index 93880fce..a18c938c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -439,15 +439,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails)); } Model.Comprehensive_DesignDetails designDetails = BLL.DesignDetailsService.GetDesignDetailsById(this.DesignDetailsId); - if (designDetails.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId))); - } - else - { + //if (designDetails.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId))); - } + //} } #endregion } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index dc9ddf73..2a50a668 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -436,15 +436,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); } - Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.DesignDrawingsId); - if (designDrawings.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDrawingsMenuId))); - } - else - { + //Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.DesignDrawingsId); + //if (designDrawings.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDrawingsMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDrawingsMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index 246db3d7..4da28c17 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -506,15 +506,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); } - var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault(); - if (oldInspectionEquipment.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId))); - } - else - { + //var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault(); + //if (oldInspectionEquipment.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index b2704742..b747c313 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -447,15 +447,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine)); } - Model.Comprehensive_InspectionMachine inspectionMachine = BLL.InspectionMachineService.GetInspectionMachineById(this.InspectionMachineId); - if (inspectionMachine.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionMachone&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionMachineMenuId))); - } - else - { + //Model.Comprehensive_InspectionMachine inspectionMachine = BLL.InspectionMachineService.GetInspectionMachineById(this.InspectionMachineId); + //if (inspectionMachine.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionMachone&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionMachineMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/inspectionMachone&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionMachineMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index da1ef2b6..68154aa6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -684,15 +684,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); } - Model.Comprehensive_InspectionPerson inspectionPerson = BLL.InspectionPersonService.GetInspectionPersonById(this.InspectionPersonId); - if (inspectionPerson.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId))); - } - else - { + //Model.Comprehensive_InspectionPerson inspectionPerson = BLL.InspectionPersonService.GetInspectionPersonById(this.InspectionPersonId); + //if (inspectionPerson.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 6157945e..f2b305c4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -529,14 +529,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); } Model.Comprehensive_NCRManagement nCRManagement = BLL.NCRManagementService.GetNCRManagementById(this.NCRManagementId); - if (nCRManagement.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/nCRManagement&menuId={1}", this.hdAttachUrl.Text, BLL.Const.NCRManagementMenuId))); - } - else - { + //if (nCRManagement.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/nCRManagement&menuId={1}", this.hdAttachUrl.Text, BLL.Const.NCRManagementMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/nCRManagement&menuId={1}", this.hdAttachUrl.Text, BLL.Const.NCRManagementMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index 27a642a2..29c7c7ae 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -421,14 +421,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipe)); } Model.Comprehensive_PressurePipe pressurePipe = BLL.PressurePipeService.GetPressurePipeById(this.PressurePipeId); - if (pressurePipe == null || ((pressurePipe.CompileMan == CurrUser.UserId && pressurePipe.Status == BLL.Const.Comprehensive_Compile) || (pressurePipe.CompileMan == CurrUser.UserId && pressurePipe.Status == BLL.Const.Comprehensive_ReCompile))) - { + //if (pressurePipe == null || ((pressurePipe.CompileMan == CurrUser.UserId && pressurePipe.Status == BLL.Const.Comprehensive_Compile) || (pressurePipe.CompileMan == CurrUser.UserId && pressurePipe.Status == BLL.Const.Comprehensive_ReCompile))) + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/pressurePipe&menuId={1}", this.hdAttachUrl.Text, BLL.Const.PressurePipeMenuId))); - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/pressurePipe&menuId={1}", this.hdAttachUrl.Text, BLL.Const.PressurePipeMenuId))); - } + //} + //else + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/pressurePipe&menuId={1}", this.hdAttachUrl.Text, BLL.Const.PressurePipeMenuId))); + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs index a30bd884..2abfd6c8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs @@ -402,15 +402,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccident)); } - Model.Comprehensive_QualityAccident pressurePipe = BLL.QualityAccidentService.GetQualityAccidentById(this.QualityAccidentId); - if (pressurePipe.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/pressurePipe&menuId={1}", this.hdAttachUrl.Text, BLL.Const.QualityAccidentMenuId))); - } - else - { + //Model.Comprehensive_QualityAccident pressurePipe = BLL.QualityAccidentService.GetQualityAccidentById(this.QualityAccidentId); + //if (pressurePipe.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/pressurePipe&menuId={1}", this.hdAttachUrl.Text, BLL.Const.QualityAccidentMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/pressurePipe&menuId={1}", this.hdAttachUrl.Text, BLL.Const.QualityAccidentMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs index 8ac2f27b..41d86e4b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs @@ -187,14 +187,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); } Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.Id); - if (designDrawings.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId))); - } - else - { + //if (designDrawings.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx index 4cc67c08..be81e641 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx @@ -9,11 +9,11 @@
- + - - - @@ -49,47 +52,47 @@ - - - - - - - - - - - + - - + + - + @@ -114,11 +117,11 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Width="900px" Height="550px"> - - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs index 9c6cba76..836026be 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; namespace FineUIPro.Web.Comprehensive { @@ -273,5 +274,170 @@ namespace FineUIPro.Web.Comprehensive return "编制"; } + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.SiteVisaManagementDataInUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + + var lists = (from x in Funs.DB.Comprehensive_SiteVisaManagement + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + if (sdrpUnitId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.UnitId == sdrpUnitId.SelectedValue); + } + if (this.sdrpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + lists = lists.Where(x => x.CNProfessionalId == sdrpCNProfessionalId.SelectedValue); + } + if (!string.IsNullOrEmpty(this.txtStarTime.Text.Trim())) + { + lists = lists.Where(x => x.VisaDate >= Funs.GetNewDateTime(this.txtStarTime.Text.Trim())); + } + if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim())) + { + lists = lists.Where(x => x.VisaDate <= Funs.GetNewDateTime(this.txtEndTime.Text.Trim())); + } + lists = lists.OrderBy(x => x.RemarkCode); + if (lists != null) + { + string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + newUrl = uploadfilepath.Replace("现场签证管理导入模板", "现场签证管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 2; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + string unitName = string.Empty; + if (!string.IsNullOrEmpty(item.UnitId)) + { + unitName = BLL.UnitService.GetUnitNameByUnitId(item.UnitId); + } + cell.SetCellValue(unitName);//签证单位 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.VisaCode);//施工签证单编号 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.VisaContent);//施工签证单内容 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.ProcessingState);//费用审核状态 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + string unitWorkName = string.Empty; + var unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(item.UnitWorkId); + if (unitWork != null) + { + unitWorkName = unitWork.UnitWorkName; + } + cell.SetCellValue(unitWorkName);//单位工程 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + string proName = string.Empty; + var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId); + if (cnp != null) + { + proName = cnp.ProfessionalName; + } + cell.SetCellValue(proName);//专业 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.VisaDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.VisaDate) : "");//签证时间 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.SignMan);//签证人 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.AuditMan);//审批人 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Remark);//备注 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.designer.cs index 6c73c934..88c94c36 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Comprehensive -{ - - - public partial class SiteVisaManagement - { - +namespace FineUIPro.Web.Comprehensive { + + + public partial class SiteVisaManagement { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// sdrpUnitId 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList sdrpUnitId; - + /// /// sdrpCNProfessionalId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList sdrpCNProfessionalId; - + /// /// txtStarTime 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + /// /// btnSearch 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 控件。 /// @@ -130,7 +128,16 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// txtStatus 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label txtStatus; - + /// /// lbtnFileUrl 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// WindowAtt 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs index ad609dc3..f56ed2ff 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs @@ -169,7 +169,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x; var cns = from x in Funs.DB.Base_CNProfessional select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { string row0 = pds.Rows[i][0].ToString().Trim(); if (!string.IsNullOrEmpty(row0)) @@ -244,6 +244,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; } + else + { + try + { + int t = Convert.ToInt32(row10); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row10 + "]错误！" + "|"; + } + } } if (!string.IsNullOrEmpty(result)) { @@ -387,9 +398,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive var oldViewInfos = from x in Funs.DB.Comprehensive_SiteVisaManagement where x.ProjectId == this.CurrUser.LoginProjectId select x; - for (int i = 0; i < ir; i++) + for (int i = 1; i < ir; i++) { - var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim()).FirstOrDefault(); + var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][10].ToString().Trim())).FirstOrDefault(); if (oldViewInfo == null) { Model.Comprehensive_SiteVisaManagement Ins = new Model.Comprehensive_SiteVisaManagement(); @@ -416,7 +427,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.SignMan = pds.Rows[i][7].ToString().Trim(); Ins.AuditMan = pds.Rows[i][8].ToString().Trim(); Ins.Remark = pds.Rows[i][9].ToString().Trim(); - Ins.RemarkCode = pds.Rows[i][10].ToString().Trim(); + Ins.RemarkCode = Funs.GetNewInt(pds.Rows[i][10].ToString().Trim()); Ins.CompileMan = this.CurrUser.UserId; Ins.Status = BLL.Const.Comprehensive_Compile; Ins.VisaId = SQLHelper.GetNewID(); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx index eb016042..9bddf3de 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx @@ -64,6 +64,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs index ec69f2d4..35cdefa5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs @@ -75,6 +75,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtSignMan.Text = siteVisaManagement.SignMan; this.txtAuditMan.Text = siteVisaManagement.AuditMan; this.txtRemark.Text = siteVisaManagement.Remark; + this.txtRemarkCode.Text = siteVisaManagement.RemarkCode.HasValue ? siteVisaManagement.RemarkCode.ToString() : ""; var currApprove = SiteVisaManagementApproveService.GetCurrentApprove(siteVisaManagement.VisaId); @@ -132,7 +133,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtVisaDate.Readonly = true; this.drpUnitWorkId.Readonly = true; this.drpProcessingState.Readonly = true; - this.drpAudit.Readonly = true; + this.drpAudit.Readonly = true; + this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; } @@ -172,6 +174,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_SiteVisaManagement.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.VisaId != this.VisaId || (this.VisaId == null && x.VisaId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_SiteVisaManagement siteVisaManagement = new Model.Comprehensive_SiteVisaManagement(); siteVisaManagement.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -200,6 +208,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive siteVisaManagement.SignMan = this.txtSignMan.Text.Trim(); siteVisaManagement.AuditMan = this.txtAuditMan.Text.Trim(); siteVisaManagement.Remark = this.txtRemark.Text.Trim(); + siteVisaManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.VisaId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -238,6 +247,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } + var q = Funs.DB.Comprehensive_SiteVisaManagement.FirstOrDefault(x => x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.VisaId != this.VisaId || (this.VisaId == null && x.VisaId != null))); + if (q != null) + { + Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + return; + } Model.Comprehensive_SiteVisaManagement siteVisaManagement = new Model.Comprehensive_SiteVisaManagement(); siteVisaManagement.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) @@ -266,6 +281,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive siteVisaManagement.SignMan = this.txtSignMan.Text.Trim(); siteVisaManagement.AuditMan = this.txtAuditMan.Text.Trim(); siteVisaManagement.Remark = this.txtRemark.Text.Trim(); + siteVisaManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); if (string.IsNullOrEmpty(this.VisaId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -405,15 +421,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement)); } - Model.Comprehensive_SiteVisaManagement siteVisaManagement = BLL.SiteVisaManagementService.GetSiteVisaManagementById(this.VisaId); - if (siteVisaManagement.Status == BLL.Const.Comprehensive_Complete) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/siteVisaManagement&menuId={1}", this.hdAttachUrl.Text, BLL.Const.SiteVisaManagementMenuId))); - } - else - { + //Model.Comprehensive_SiteVisaManagement siteVisaManagement = BLL.SiteVisaManagementService.GetSiteVisaManagementById(this.VisaId); + //if (siteVisaManagement.Status == BLL.Const.Comprehensive_Complete) + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/siteVisaManagement&menuId={1}", this.hdAttachUrl.Text, BLL.Const.SiteVisaManagementMenuId))); + //} + //else + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/siteVisaManagement&menuId={1}", this.hdAttachUrl.Text, BLL.Const.SiteVisaManagementMenuId))); - } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs index 093d0b03..98e4bd73 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class SiteVisaManagementEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class SiteVisaManagementEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnitId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtVisaCode 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtVisaCode; - + /// /// txtVisaContent 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtVisaContent; - + /// /// drpUnitWorkId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkId; - + /// /// drpCNProfessionalId 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtVisaDate 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtVisaDate; - + /// /// txtSignMan 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSignMan; - + /// /// txtAuditMan 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAuditMan; - + /// /// drpProcessingState 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProcessingState; - + /// /// txtRemark 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// Panel2 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -157,7 +155,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + + /// + /// txtRemarkCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtRemarkCode; + /// /// drpAudit 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index 7e3bf8a0..03838e69 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -415,15 +415,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment)); } - Model.Comprehensive_SpecialEquipment specialEquipment = BLL.SpecialEquipmentServices.GetEquipmentById(this.SpecialEquipmentId); - if (specialEquipment == null || ((specialEquipment.CompileMan == CurrUser.UserId && specialEquipment.Status == BLL.Const.Comprehensive_Compile) || (specialEquipment.CompileMan == CurrUser.UserId && specialEquipment.Status == BLL.Const.Comprehensive_ReCompile))) - { + //Model.Comprehensive_SpecialEquipment specialEquipment = BLL.SpecialEquipmentServices.GetEquipmentById(this.SpecialEquipmentId); + //if (specialEquipment == null || ((specialEquipment.CompileMan == CurrUser.UserId && specialEquipment.Status == BLL.Const.Comprehensive_Compile) || (specialEquipment.CompileMan == CurrUser.UserId && specialEquipment.Status == BLL.Const.Comprehensive_ReCompile))) + //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/specialEquipment&menuId={1}", this.hdAttachUrl.Text, BLL.Const.SpecialEquipmentMenuId))); - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/specialEquipment&menuId={1}", this.hdAttachUrl.Text, BLL.Const.SpecialEquipmentMenuId))); - } + //} + //else + //{ + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/specialEquipment&menuId={1}", this.hdAttachUrl.Text, BLL.Const.SpecialEquipmentMenuId))); + //} } #endregion diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..cf907db2 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,87 @@ + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\DesignChangeOrder.aspx(42): error CS1061: “ASP.cqms_comprehensive_designchangeorder_aspx”不包含“btnOut_Click”的定义，并且找不到可接受类型为“ASP.cqms_comprehensive_designchangeorder_aspx”的第一个参数的扩展方法“btnOut_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:04/29/2024 22:26:31 +出错文件:http://localhost:8579/CQMS/Comprehensive/DesignChangeOrder.aspx +IP地址:::1 + +出错时间:04/29/2024 22:26:31 + + +错误信息开始=====> +错误类型:InvalidOperationException +错误信息:序列不包含任何元素 +错误堆栈: + 在 FineUIPro.Web.CQMS.Comprehensive.DesignChangeOrderDataIn.ImportXlsToData2(String fileName) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\DesignChangeOrderDataIn.aspx.cs:行号 398 + 在 FineUIPro.Web.CQMS.Comprehensive.DesignChangeOrderDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\DesignChangeOrderDataIn.aspx.cs:行号 341 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/29/2024 22:58:57 +出错文件:http://localhost:8579/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/29/2024 22:58:57 + + +错误信息开始=====> +错误类型:IOException +错误信息:文件“E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\File\Excel\DataIn\现场签证管理导入模板.xls”正由另一进程使用，因此该进程无法访问此文件。 +错误堆栈: + 在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) + 在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost) + 在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share) + 在 System.Web.HttpResponse.TransmitFile(String filename, Int64 offset, Int64 length) + 在 FineUIPro.Web.CQMS.Comprehensive.SiteVisaManagementDataIn.PageManager1_CustomEvent(Object sender, CustomEventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\SiteVisaManagementDataIn.aspx.cs:行号 482 + 在 FineUIPro.PageManager.OnCustomEvent(CustomEventArgs e) + 在 (PageManager , CustomEventArgs ) + 在 FineUIPro.PageManager.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/29/2024 23:40:23 +出错文件:http://localhost:8579/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/29/2024 23:40:23 + + +错误信息开始=====> +错误类型:IOException +错误信息:文件“E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\File\Excel\DataIn\现场签证管理导入模板.xls”正由另一进程使用，因此该进程无法访问此文件。 +错误堆栈: + 在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) + 在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost) + 在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share) + 在 System.Web.HttpResponse.TransmitFile(String filename, Int64 offset, Int64 length) + 在 FineUIPro.Web.CQMS.Comprehensive.SiteVisaManagementDataIn.PageManager1_CustomEvent(Object sender, CustomEventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\SiteVisaManagementDataIn.aspx.cs:行号 482 + 在 FineUIPro.PageManager.OnCustomEvent(CustomEventArgs e) + 在 (PageManager , CustomEventArgs ) + 在 FineUIPro.PageManager.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/29/2024 23:41:10 +出错文件:http://localhost:8579/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/29/2024 23:41:10 + diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/培训记录模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/培训记录模板.xls deleted file mode 100644 index df486a510c02722255bda08cd00f5af2da8ea097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/施工技术交底管理模板.xls b/SGGL/FineUIPro.Web/File/Excel/CQMS/施工技术交底管理模板.xls deleted file mode 100644 index 3f5d4a887972e6077d59350bae05c07df41a7833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/现场签证管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/现场签证管理导入模板.xls index 1270fd0d31ed45a72c643a11a8e13eaa35d92a61..953a4f71f63c27781bf7baa65abc3eac154a45fe 100644 GIT binary patch delta 3003 zcmbVO2~bo=8vc9c%{?#&=o~OIfCye7mmDI8+>|RS8VK<~6pdO+f};osGk}U9qVPkO6mNt57CdL=SE8jQ47O6Y}>H}bl-Xd7v`0x$GVvOhQ zCHw6KD3hXcz;?TUmQ6`_W7uLfuu%+r3`zLYfGcdmhn(*4uH4NiXFJl3Q>Kmm2Q;wo znd_@bI>6RDkqI9^UKSX*qronwZ7B<_4Iup@Y&jb^`VaBUV%<}w`z#L_h*{vvDBloW zvE2ZkSWdi#T3MJ%KM~8`vou^abb&Z3EHVrbLiiFS02r=AFmTyy4x7d0a5y|3moKz5 z6AA=Eh15c%wNxo>MyZt6*6PvDj%vFJ_SV);USlUra`o`=uyOR6>h0#|?C#-4q97iR zClmpxO1ZfRTV1v=IaK0qv!G;)2ipAz|d3*sj zI3orIVlo*Nlf|O&Hlj?d2TH<{+PVg@EoLp^*nMj0mR)>+Yd`H|!-(0f`qA!*DLFj; zNSR!rbQt64GG)<$W75`NG5E~ELi zy8p=9iUpzFe;OCzQJ(swXLom@UsLAYro7_4J>$>bM~swo|Hp?A0Jh`M}bmDS}!Mn>0?t~tsD z`;reoSXZ<5;G?Ru`H6)Ys3`N{4M^j({9aue(&`cSMOmAR_Co5<@|nPCOKLEHuA_Lv zT>XlEukS_4E3KUWtjSq9JJMUFNXf{3C0TH!*_(Z#JxP&K>$XU9ApFM|%G)N} z%mC>4{25l!MFHmDER5d&i&^@m_QOT9=Y-tLfz>q?`M#U>Z|hchb#KoLJm0q3@9QN+{>PZ?m$i!PoKYL;!UA}+uZp@}x)gRIG{BpQLkgJI|{W!qdl9X&yBR_u!ThEtCY9YeqfdV3C;jac4ks+Q9Y-knGDgFx(gKqV=5Y1zfkby`9T!t7Beal~^ zy+A4`t`mXpeWAdIf8kDkuR+Gq#39U)q)Z$GrU40S;+VK zu`!2HX$M&jX1T*kE`$Loza~>2){&=^iQ_{!dGA06wttLgOPB!vgeQP;>mOoX3|u{l zL{b#tTtvXsUm-M5#-fUVr^j`5u+ifvzLo)eqYFu$QOMAbG|%*}-5uoyoJ)7a-JS{dv_>mubPAr!qgVlNvi kHTb1X`$y)KL}}RMFmvhCO|M7)2BIH>%K!iX literal 19968 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 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls index 59a5948c65b58b004c9e9334bb9241a4613d759e..c80f278dbed602670a205c2e35ae427c27c32155 100644 GIT binary patch delta 3343 zcmbVP2~-qE8vd)NXL=5XIXLEkfdNF&2__V(kpF?fO$Y^YLMqqb0|36b`r+CQ*XKOXlNx~gJ*w7F(@;76u6)6%ip+$q zmr-|YE#Pu!mTHgVp3%$DZZ1cdi)2-gg=L6}M%)4>n2TgYRi#WagQQ%mvj)lVJ%me9 z_;4Dz0y%RExkjhJaUSzZfO9Y$cRc_s#v9-YN{&@%bgC||5qD({uZoQ2epjfO5F6Wt zyN=ne4)z9>YO`#!3}}hX>&7XR8syFeC_}gplxl9LO3M`}MLL~>|26KALce9>>$wVL z0@8D>Dh`>~h$-s%LM9tW@~c@eEwXEat#Mun&}+%>fiJ3yt1HbxtP zvI`aAVF=U!uh|)!9S61BX$N2YCwAehabEE4_O3XrBaq}z2E39G-IeGo3DMEEAIKBC zLLSNJMM;Jq&gzZ%;vmR>#ZCwm$icO0p36BoC-l&8Y^0JVhZBg zT(!bDLN534Botx%%OK%pkoXcnNu1QptLm`NMjf>zl1m-ruD=n3{UAbSm<1X5$^sL- zkC)cFu^c-nhW$6x3i0Z*9w0LWBCC-!P5=VjP`IMbD#xv(cmuLd#r%=LSjXX3D7>Rz z8a_L!!#rsqwJ$HVavcw0*iObe%FcL$H3-{YW3uab{vv+^l*#c)@qiG5Dfj~Z3Je9Y zNW_SQVuoQP60y|DRqiB{IqB3c3Ri>P+smN$^fY!04lw%m^7Hfz?BAnT?>?cSq22-E zg9n%*g8PP=NDw5ENStI&TDe?n^6~UBy5_~)3!((HP{fEOQW+*3QUZkp0*V$0g*1)X`PdJ%N~refGeqPvVk+bNo~x;lE!!pb zi#c%IZR8nix4!8MmrJDX8m&(6-#s9(N6*l(e*Fi84;&gB7oU)rlx!X~`kgUj$E8i1 zo-t$Qtl4w^mbGYc_L7{XD^|Y$LD8z>l5%dt#!Z_)+_H7|p1mJ^{K==EeSWa&>qFHw zhii{~SKrY1ebWyoPM-bex$_sAFJ8Lb^7GAKZrx_@-2L@l+r!@;J^uYk`_pGc83KV_ z*b8m1DN|u(6io|ghA2Z+Hm(8{E%fOlQV$uyOnuMA*HkEWjVar8;JC!E??|g#`oc3( z_imvr{%u5?O0gT<16fv{a<8V z%DQs6W@xuF;Zy!m|Cx{Frt#6;^C90=tk&!ZJD(X^H^U<_cvGLCnoH+53|y-L@+@vHaWI#^=WNj}}!ee%h(^E^(LQn@##-x#Hzv^{h0uZxc?+I_#Kx;VWw7p={|cNKD&rax*cV$Xz* z{cz{GkfYf@X@>)IF5@^41&|! zTi;rE^n8Xcx6U**YgfW4Gd;k&P|gF|KQYCFO1?H{EsNc$=Ex5(4m`?ZG8&;9M`nDIN?wb%24+B7AV{a1(@ z4xBI=zC1cDx74ubdgR6$9-P{KZhgwb8Md|KSjYS$mBj+G=0|)w zeQo6DtU&a%PIrazTFI4`z@v3V151xo*4IfNEKGan(5M*!{v{o?Q4?#w+N;}`=W(8V^%$PYU;lKS@X)U*;$6T;`B1LZ+d>e8#@O# z`CTpvq&DnuZg0%h9{Q&3(8|U4>+5RYGI}+pn=9It?3Wdm>$0qMqG8SVdu?4?Y4mBG zsr4JYI5_2BPr?JPl>`dD*^O`frJ*3RYVn(<5DftkA45t|f(1q6K99s8h7M38{Msh3 zZjb;vy4nc4aJ^_Y!lM~R7;VNzmlS=9e3Ugu3W3l#dG6RAAdUib(fnw}X!8@Zm?t&~ z?*?eJ`R&wO6J<;7WHGNF*E7Xo3tZ%B>;(qnhD|V8!gF+lkDLLdPZ^Ywlm7h(DR8|b z0?f{UW~L8Y)i~u4wut#1JyQ;dnbkbmoqb{^ zY?6j+iah1VGWj?O&w~_;nlPCAHlnAL>`4B23yvMaStFjAK%&5#6b<>9f$%j^)rBeS zx$E171$axlE8#pNgDH@3!y>)XvRt~n5Skz zu#)VP5RDWz8`%qF(3|4Eigag>0yzsIhMR0&4X7f1?8N&P4$N>sj1a0BsG#Edq(vJ}(#m*OQjA6i97DNa`eC zLfwkngS6dF!jKGB;MF|^cUdUF7d?c`jIfYQ`!T%1s({A^F+>T-sxMeUPPm0Dh&Kk( zzz9#$4Qu*fG#qBbG*|gzn&m zPoiSHrc_gi#ZeeMis!|)vBVZhsi9iLJ&5k-Cf!1;l3Se*m3XC4RS^{>D39%?B~whk zA;^D|oTEtQ1alFT7Ck>OVjn7xcW2(APMZW5lB*2yQYvN#eu7}(V{L6THL4RkTD#rC zzm8wxbK!{zTyI**6(rUQEn)a`g^NsDUY?vKA|D&2h--;Su4+h*K%6Bh`rt4N`X408 BxN-mh delta 1172 zcmYjRU1$_n6h3D%yR);K$^7glvzySGHU4Y6A}DH-W_4F$Z5Xq=306``h(s+FA0$2m zH5&vaw6->TETNzg#7Ai;V}(M05-{<}KM)mtsL#GcL@P+^cN=c8t?9%jP|03VqVoFPQB#VOX@$3i92Y&y=n9TJ4GW zLIpQi5lh}MA8*nUF?vm#YNAQ9qdK4Q4GNneSOCINENQCoR44|gLS0sY=X1gyFJa6Yu%ao z59UP2ddO5TPW_rK*axGuu%;>RV3c3rK+)_dYd{TIQsJrmCK(m=-BnVjV zG&@86vpIU5Sv{Zu9`5fLo$3267xE^0{v7zksrFtSINxLRtDXrc?+*^%JdS-KZ{1-* zS9{Mcbc`-Fss>b!JnpS4zAc12QBBOzoI7LMe%13J%$42QOvke8!pPOHrfcZ^u8)h*uxPD<3J+E-;xK3b zZk`9J#?K~-m~WyaCQj&a|8fM=@IQNqwZq@b2pI{3GLjfc6;xG(om|oaDKnBQD8MLC zK|w~r3Q`~gVtmR$L(GYpDI=AUT0vn>D2jT_-oNk(@R?-6O%4@+G|<&Anqugu5xwJ5 zyq`sVsyn^At%|OkW0L;}a>=Pv zR!N)xd9gL?e&mEXsaR89cJZXIJKJfh^Y_5)5B%ex;oO;0SGtrR42oW#M|zOo - + @@ -77,7 +77,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index be4aa57b..c0862b9e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1460,6 +1460,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2018,6 +2021,9 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); + partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -6510,6 +6516,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligations + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -7998,6 +8012,14 @@ namespace Model } } + public System.Data.Linq.Table Report_CQMS_ProblemHandle + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Report_CqmsTarget { get @@ -21591,8 +21613,6 @@ namespace Model private string _CodeRule; - private EntitySet _Doc_DocManage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21609,7 +21629,6 @@ namespace Model public Base_DocType() { - this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21693,19 +21712,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManage - { - get - { - return this._Doc_DocManage; - } - set - { - this._Doc_DocManage.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -21725,18 +21731,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = this; - } - - private void detach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -90591,7 +90585,7 @@ namespace Model private string _AuditMan; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Base_CNProfessional; @@ -90639,7 +90633,7 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -91023,8 +91017,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -98235,10 +98229,10 @@ namespace Model private string _AuditMan; - private string _Problem; - private string _Measure; + private string _Problem; + private string _RemarkCode; private EntityRef _Sys_User; @@ -98287,10 +98281,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnProblemChanging(string value); - partial void OnProblemChanged(); partial void OnMeasureChanging(string value); partial void OnMeasureChanged(); + partial void OnProblemChanging(string value); + partial void OnProblemChanged(); partial void OnRemarkCodeChanging(string value); partial void OnRemarkCodeChanged(); #endregion @@ -98660,27 +98654,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")] - public string Problem - { - get - { - return this._Problem; - } - set - { - if ((this._Problem != value)) - { - this.OnProblemChanging(value); - this.SendPropertyChanging(); - this._Problem = value; - this.SendPropertyChanged("Problem"); - this.OnProblemChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] public string Measure { get @@ -98700,6 +98674,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + public string Problem + { + get + { + return this._Problem; + } + set + { + if ((this._Problem != value)) + { + this.OnProblemChanging(value); + this.SendPropertyChanging(); + this._Problem = value; + this.SendPropertyChanged("Problem"); + this.OnProblemChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] public string RemarkCode { @@ -101055,7 +101049,7 @@ namespace Model private string _Status; - private string _RemarkCode; + private System.Nullable _RemarkCode; private EntityRef _Sys_User; @@ -101113,7 +101107,7 @@ namespace Model partial void OnRemarkChanged(); partial void OnStatusChanging(string value); partial void OnStatusChanged(); - partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanging(System.Nullable value); partial void OnRemarkCodeChanged(); #endregion @@ -101567,8 +101561,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] - public string RemarkCode + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="Int")] + public System.Nullable RemarkCode { get { @@ -121058,8 +121052,6 @@ namespace Model private EntityRef _Base_CNProfessional; - private EntityRef _Base_DocType; - private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -121111,7 +121103,6 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); - this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -121190,10 +121181,6 @@ namespace Model { if ((this._DocTypeId != value)) { - if (this._Base_DocType.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -121513,40 +121500,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] - public Base_DocType Base_DocType - { - get - { - return this._Base_DocType.Entity; - } - set - { - Base_DocType previousValue = this._Base_DocType.Entity; - if (((previousValue != value) - || (this._Base_DocType.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_DocType.Entity = null; - previousValue.Doc_DocManage.Remove(this); - } - this._Base_DocType.Entity = value; - if ((value != null)) - { - value.Doc_DocManage.Add(this); - this._DocTypeId = value.DocTypeId; - } - else - { - this._DocTypeId = default(string); - } - this.SendPropertyChanged("Base_DocType"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -121717,8 +121670,6 @@ namespace Model private EntityRef _Doc_DocManage; - private EntityRef _Sys_User; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -121742,7 +121693,6 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -121790,7 +121740,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] public string ApproveMan { get @@ -121801,10 +121751,6 @@ namespace Model { if ((this._ApproveMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -121928,40 +121874,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.Doc_DocManageApprove.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.Doc_DocManageApprove.Add(this); - this._ApproveMan = value.UserId; - } - else - { - this._ApproveMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -235749,6 +235661,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] + public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligations() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligations.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligations.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -241948,6 +242083,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligations; + private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -242220,6 +242357,7 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -244400,6 +244538,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligations + { + get + { + return this._Manager_Month_ComplianceObligations; + } + set + { + this._Manager_Month_ComplianceObligations.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -244981,6 +245132,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -273325,7 +273488,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -273339,18 +273502,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); @@ -273367,8 +273532,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); @@ -273381,18 +273546,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() @@ -273520,22 +273687,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(); } } } @@ -273660,26 +273827,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 { @@ -273700,26 +273847,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 { @@ -273780,6 +273907,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; @@ -273821,14 +274008,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); @@ -273847,14 +274034,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() @@ -274002,26 +274189,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 { @@ -274082,6 +274249,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; @@ -275014,7 +275201,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 @@ -275137,6 +275324,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -275145,6 +275338,12 @@ namespace Model private string _Owner; + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -275155,9 +275354,7 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; + private System.Nullable _WanderIsComplete; private System.Nullable _SubcontractorAllPassData; @@ -275167,35 +275364,25 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderIsComplete; - private System.Nullable _WanderCompleteData; + private System.Nullable _WorkPackType; + private System.Nullable _IsSiteImplement; - private string _SiteImplementUser; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - private System.Nullable _InspectIsClose; - private string _InspectIsCloseUser; - private System.Nullable _InspectCloseData; - private System.Nullable _IsUnifyWanderAbout; + private string _InspectIsCloseUser; - private System.Nullable _UnifyWanderAboutData; + private string _PropertyTechnologyId; - private string _UnifyWanderAboutOpinion; + private System.Nullable _RecordUploadData; - private System.Nullable _InspectTime; + private System.Nullable _SiteImplementConfirmData; - private string _AddUser; - - private System.Nullable _AddTime; + private string _SiteImplementUser; #region 可扩展性方法定义 partial void OnLoaded(); @@ -275217,6 +275404,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); @@ -275225,6 +275418,12 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -275235,10 +275434,8 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -275247,36 +275444,26 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); partial void OnInspectCloseDataChanging(System.Nullable value); partial void OnInspectCloseDataChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); #endregion public PreRun_SubInspectTerm() @@ -275444,6 +275631,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 { @@ -275524,6 +275771,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -275624,42 +275931,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete { get { - return this._WorkPackType; + return this._WanderIsComplete; } set { - if ((this._WorkPackType != value)) + if ((this._WanderIsComplete != value)) { - this.OnWorkPackTypeChanging(value); + this.OnWanderIsCompleteChanging(value); this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); } } } @@ -275744,26 +276031,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete - { - get - { - return this._WanderIsComplete; - } - set - { - if ((this._WanderIsComplete != value)) - { - this.OnWanderIsCompleteChanging(value); - this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -275784,6 +276051,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -275804,66 +276091,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] public System.Nullable InspectIsClose { @@ -275884,26 +276111,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] public System.Nullable InspectCloseData { @@ -275924,122 +276131,102 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] + public string InspectIsCloseUser { get { - return this._IsUnifyWanderAbout; + return this._InspectIsCloseUser; } set { - if ((this._IsUnifyWanderAbout != value)) + if ((this._InspectIsCloseUser != value)) { - this.OnIsUnifyWanderAboutChanging(value); + this.OnInspectIsCloseUserChanging(value); this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] + public string PropertyTechnologyId { get { - return this._UnifyWanderAboutData; + return this._PropertyTechnologyId; } set { - if ((this._UnifyWanderAboutData != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnUnifyWanderAboutDataChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._UnifyWanderAboutOpinion; + return this._RecordUploadData; } set { - if ((this._UnifyWanderAboutOpinion != value)) + if ((this._RecordUploadData != value)) { - this.OnUnifyWanderAboutOpinionChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData { get { - return this._InspectTime; + return this._SiteImplementConfirmData; } set { - if ((this._InspectTime != value)) + if ((this._SiteImplementConfirmData != value)) { - this.OnInspectTimeChanging(value); + this.OnSiteImplementConfirmDataChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] + public string SiteImplementUser { get { - return this._AddUser; + return this._SiteImplementUser; } set { - if ((this._AddUser != value)) + if ((this._SiteImplementUser != value)) { - this.OnAddUserChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -276107,22 +276294,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; @@ -276135,6 +276306,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); @@ -276175,22 +276362,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); @@ -276203,6 +276374,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() @@ -276570,166 +276757,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 { @@ -276750,7 +276777,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] public string PropertyTechnologyId { get @@ -276850,6 +276877,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; @@ -277851,8 +278038,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -277863,11 +278048,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; @@ -277883,6 +278066,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -277919,8 +278106,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); @@ -277931,12 +278116,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); @@ -277951,6 +278134,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 @@ -278260,26 +278447,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 { @@ -278380,26 +278547,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 { @@ -278420,22 +278567,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(); } } } @@ -278580,6 +278727,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 { @@ -279292,7 +279479,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 @@ -314177,6 +314364,164 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] + public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ReportId; + + private string _ReType; + + private string _UnitName; + + private string _ProblemDes; + + #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 OnReportIdChanging(string value); + partial void OnReportIdChanged(); + partial void OnReTypeChanging(string value); + partial void OnReTypeChanged(); + partial void OnUnitNameChanging(string value); + partial void OnUnitNameChanged(); + partial void OnProblemDesChanging(string value); + partial void OnProblemDesChanged(); + #endregion + + public Report_CQMS_ProblemHandle() + { + 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="_ReportId", DbType="NVarChar(50)")] + public string ReportId + { + get + { + return this._ReportId; + } + set + { + if ((this._ReportId != value)) + { + this.OnReportIdChanging(value); + this.SendPropertyChanging(); + this._ReportId = value; + this.SendPropertyChanged("ReportId"); + this.OnReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")] + public string ReType + { + get + { + return this._ReType; + } + set + { + if ((this._ReType != value)) + { + this.OnReTypeChanging(value); + this.SendPropertyChanging(); + this._ReType = value; + this.SendPropertyChanged("ReType"); + this.OnReTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this.OnUnitNameChanging(value); + this.SendPropertyChanging(); + this._UnitName = value; + this.SendPropertyChanged("UnitName"); + this.OnUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] + public string ProblemDes + { + get + { + return this._ProblemDes; + } + set + { + if ((this._ProblemDes != value)) + { + this.OnProblemDesChanging(value); + this.SendPropertyChanging(); + this._ProblemDes = value; + this.SendPropertyChanged("ProblemDes"); + this.OnProblemDesChanged(); + } + } + } + + 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.Report_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged { @@ -350624,8 +350969,6 @@ namespace Model private EntitySet _Doc_DocManage; - private EntitySet _Doc_DocManageApprove; - private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -351341,7 +351684,6 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); - this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -353746,19 +354088,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManageApprove - { - get - { - return this._Doc_DocManageApprove; - } - set - { - this._Doc_DocManageApprove.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -358263,18 +358592,6 @@ namespace Model entity.Sys_User = null; } - private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging();