diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 30b5d41..748fb6b 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -2500,6 +2500,11 @@ namespace BLL /// 质量控制点检查记录导出模板 /// public const string JGZL_QualityControlPointInspectionUrl = "File\\Word\\JGZL\\质量控制点检查记录导出模板.docx"; + + /// + /// 隐蔽工程验收记录导出模板 + /// + public const string JGZL_ConcealedWorksInspectionRecordUrl = "File\\Word\\JGZL\\隐蔽工程验收记录导出模板.docx"; #endregion } } diff --git a/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs b/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs index 038fa51..6e059a9 100644 --- a/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs +++ b/HJGL_DS/BLL/JGZL/ConcealedWorksInspectionRecordService.cs @@ -18,6 +18,16 @@ namespace BLL return Funs.DB.JGZL_ConcealedWorksInspectionRecord.FirstOrDefault(e => e.RecordId == Id); } + /// + /// 根据项目Id获取隐蔽工程验收记录 + /// + /// + /// + public static Model.JGZL_ConcealedWorksInspectionRecord GetConcealedWorksInspectionRecordByProjectId(string projectId) + { + return Funs.DB.JGZL_ConcealedWorksInspectionRecord.FirstOrDefault(e => e.ProjectId == projectId); + } + /// /// 添加隐蔽工程验收记录 /// diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/隐蔽工程验收记录导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/隐蔽工程验收记录导出模板.docx new file mode 100644 index 0000000..b776b1f --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/隐蔽工程验收记录导出模板.docx @@ -0,0 +1,47 @@ + SH/T 3503 -- J112 + 隐蔽工程验收记录 +工程名称： +单位工程名称：管道安装工程 + 隐蔽项目 + + 施工图号 + + 隐 + 蔽 + 内 + 容 + 及 + 简 + 图 + + 检 + 查 + 结 + 果 + + + + + + + + + + + + 建设/监理单位 + 总承包单位 + 施工单位 +专业工程师： + + +日期： 年 月 日 +专业工程师： + + +日期： 年 月 日 +施工班组长： +质量检查员： +专业工程师： +日期： 年 月 日 + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx index a939451..79615b1 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx @@ -39,14 +39,46 @@ - + + + <%----%> + - + + + + + + + + + + + + + + + + + + <%-- + + + + --%> + + + <%-- - + --%> - + --%> - + <%-- - + --%> - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs index 3940e43..081b6ff 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs @@ -1,18 +1,53 @@ -using BLL; +using Aspose.Words; +using BLL; +using FastReport; using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Data; +using System.Data.SqlClient; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using System.IO; +using System.Windows.Forms; namespace FineUIPro.Web.JGZL { public partial class ConcealedWorksInspectionRecord : PageBase { + #region 定义项 + /// + /// 主键 + /// + private string RecordId + { + get + { + return (string)ViewState["RecordId"]; + } + set + { + ViewState["RecordId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + #region 加载页面 /// /// 加载页面 @@ -23,7 +58,7 @@ namespace FineUIPro.Web.JGZL { if (!IsPostBack) { - this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.drpProjectId.DataTextField = "ProjectCode"; this.drpProjectId.DataValueField = "ProjectId"; @@ -34,7 +69,40 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; - this.BindGrid(); + this.ProjectId = this.tvControlItem.SelectedNodeID; + DataInfo(); + //this.BindGrid(); + } + } + + /// + /// 绑定数据 + /// + /// + private void DataInfo() + { + this.RecordId = string.Empty; + this.txtDrawingNumber.Text = string.Empty; + this.txtConcealedWorks.Text = string.Empty; + this.txtConcealedContentAndDiagram.Text = string.Empty; + this.txtInspectionResults.Text = string.Empty; + + if (!string.IsNullOrEmpty(this.ProjectId)) + { + var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordByProjectId(this.ProjectId); + if (report != null) + { + this.RecordId = report.RecordId; + this.txtDrawingNumber.Text = report.DrawingNumber; + this.txtConcealedWorks.Text = report.ConcealedWorks; + this.txtConcealedContentAndDiagram.Text = report.ConcealedContentAndDiagram; + this.txtInspectionResults.Text = report.InspectionResults; + } + else + { + //默认值 + + } } } #endregion @@ -82,7 +150,9 @@ namespace FineUIPro.Web.JGZL { if (this.tvControlItem.SelectedNodeID != "0") { - this.BindGrid(); + this.ProjectId = this.tvControlItem.SelectedNodeID; + DataInfo(); + //this.BindGrid(); } } #endregion @@ -91,30 +161,30 @@ namespace FineUIPro.Web.JGZL /// /// 数据绑定 /// - private void BindGrid() - { - //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); - string strSql = @"SELECT * from JGZL_ConcealedWorksInspectionRecord where 1=1"; - List listStr = new List(); - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - strSql += " AND ProjectId = @ProjectId"; - listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); - } - //else - //{ - // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; - // listStr.Add(new SqlParameter("@ProjectId", projectIds)); - //} - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - // 2.获取当前分页数据 - Grid1.RecordCount = tb.Rows.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); - } + //private void BindGrid() + //{ + // //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); + // string strSql = @"SELECT * from JGZL_ConcealedWorksInspectionRecord where 1=1"; + // List listStr = new List(); + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // strSql += " AND ProjectId = @ProjectId"; + // listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); + // } + // //else + // //{ + // // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; + // // listStr.Add(new SqlParameter("@ProjectId", projectIds)); + // //} + // SqlParameter[] parameter = listStr.ToArray(); + // DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // // 2.获取当前分页数据 + // Grid1.RecordCount = tb.Rows.Count; + // //tb = GetFilteredTable(Grid1.FilteredData, tb); + // var table = this.GetPagedDataTable(Grid1, tb); + // Grid1.DataSource = table; + // Grid1.DataBind(); + //} #endregion #region 分页排序 @@ -124,10 +194,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) - { - BindGrid(); - } + //protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + //{ + // BindGrid(); + //} #endregion #region 排序 @@ -136,10 +206,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Grid1_Sort(object sender, GridSortEventArgs e) - { - BindGrid(); - } + //protected void Grid1_Sort(object sender, GridSortEventArgs e) + //{ + // BindGrid(); + //} #endregion #region 分页选择下拉改变事件 @@ -148,11 +218,11 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) - { - Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); - BindGrid(); - } + //protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + //{ + // Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + // BindGrid(); + //} #endregion #endregion @@ -164,9 +234,10 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { - this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - BindGrid(); + this.tvControlItem.SelectedNodeID = this.ProjectId; + DataInfo(); } /// @@ -176,7 +247,7 @@ namespace FineUIPro.Web.JGZL /// protected void TextBox_TextChanged(object sender, EventArgs e) { - this.BindGrid(); + //this.BindGrid(); } #endregion @@ -197,23 +268,23 @@ namespace FineUIPro.Web.JGZL BLL.Common.FastReportService.ResetData(); Dictionary keyValuePairs = new Dictionary(); - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordById(this.Grid1.SelectedRowID); - if (report != null) - { - keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); - keyValuePairs.Add("ConcealedWorks", report.ConcealedWorks); - keyValuePairs.Add("DrawingNumber", report.DrawingNumber); - keyValuePairs.Add("ConcealedContentAndDiagram", report.ConcealedContentAndDiagram); - keyValuePairs.Add("InspectionResults", report.InspectionResults); - } - } - else - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } + //if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + //{ + // var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordById(this.Grid1.SelectedRowID); + // if (report != null) + // { + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("ConcealedWorks",txtConcealedWorks.Text.Trim()); + keyValuePairs.Add("DrawingNumber", txtDrawingNumber.Text.Trim()); + keyValuePairs.Add("ConcealedContentAndDiagram", txtConcealedContentAndDiagram.Text); + keyValuePairs.Add("InspectionResults", txtInspectionResults.Text); + // } + //} + //else + //{ + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + //} BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\隐蔽工程验收记录.frx"; @@ -236,139 +307,139 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void btnAdd_Click(object sender, EventArgs e) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); - } - else - { - Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); - return; - } - } + //protected void btnAdd_Click(object sender, EventArgs e) + //{ + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + // } + // else + // { + // Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + // return; + // } + //} /// /// 双击编辑 /// /// /// - protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", this.Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); - return; - } - } - else - { - ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + //protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + //{ + // if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) + // { + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", this.Grid1.SelectedRowID, "编辑 - "))); + // } + // else + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} /// /// 右键编辑 /// /// /// - protected void btnMenuEdit_Click(object sender, EventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", Grid1.SelectedRowID, "维护 - "))); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + //protected void btnMenuEdit_Click(object sender, EventArgs e) + //{ + // if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_ConcealedWorksInspectionRecordMenuId, BLL.Const.BtnModify)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConcealedWorksInspectionRecordEdit.aspx?recordId={0}", Grid1.SelectedRowID, "维护 - "))); + // } + // else + // { + // Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} /// /// 右键删除 /// /// /// - protected void btnMenuDelete_Click(object sender, EventArgs e) - { - if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConcealedWorksInspectionRecordMenuId, Const.BtnDelete)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } + //protected void btnMenuDelete_Click(object sender, EventArgs e) + //{ + // if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConcealedWorksInspectionRecordMenuId, Const.BtnDelete)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } - bool isShow = true; - if (Grid1.SelectedRowIndexArray.Length > 1) - { - isShow = false; - } - bool isDelete = false; - foreach (int rowIndex in Grid1.SelectedRowIndexArray) - { - string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - if (judgementDelete(rowID, isShow)) - { - isDelete = true; - BLL.ConcealedWorksInspectionRecordService.DeleteConcealedWorksInspectionRecordById(rowID); - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除隐蔽工程验收记录"); - } - } - if (isDelete) - { - ShowNotify("删除成功！", MessageBoxIcon.Success); - } - this.BindGrid(); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + // bool isShow = true; + // if (Grid1.SelectedRowIndexArray.Length > 1) + // { + // isShow = false; + // } + // bool isDelete = false; + // foreach (int rowIndex in Grid1.SelectedRowIndexArray) + // { + // string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + // if (judgementDelete(rowID, isShow)) + // { + // isDelete = true; + // BLL.ConcealedWorksInspectionRecordService.DeleteConcealedWorksInspectionRecordById(rowID); + // BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除隐蔽工程验收记录"); + // } + // } + // if (isDelete) + // { + // ShowNotify("删除成功！", MessageBoxIcon.Success); + // } + // this.BindGrid(); + // } + // else + // { + // Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} #region 判断是否可删除 /// /// 判断是否可以删除 /// /// - private bool judgementDelete(string id, bool isShow) - { - string content = string.Empty; + //private bool judgementDelete(string id, bool isShow) + //{ + // string content = string.Empty; - if (string.IsNullOrEmpty(content)) - { - return true; - } - else - { - if (isShow) - { - Alert.ShowInTop(content, MessageBoxIcon.Error); - } - return false; - } - } + // if (string.IsNullOrEmpty(content)) + // { + // return true; + // } + // else + // { + // if (isShow) + // { + // Alert.ShowInTop(content, MessageBoxIcon.Error); + // } + // return false; + // } + //} #endregion #endregion @@ -378,10 +449,128 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Window1_Close(object sender, WindowCloseEventArgs e) + //protected void Window1_Close(object sender, WindowCloseEventArgs e) + //{ + // this.InitTreeMenu();//加载树 + // this.BindGrid(); + //} + #endregion + + #region 提交按钮 + /// + /// 提交按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) { - this.InitTreeMenu();//加载树 - this.BindGrid(); + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_ConcealedWorksInspectionRecordMenuId, Const.BtnSave)) + { + Model.JGZL_ConcealedWorksInspectionRecord newReport = new Model.JGZL_ConcealedWorksInspectionRecord(); + newReport.DrawingNumber = this.txtDrawingNumber.Text.Trim(); + newReport.ConcealedWorks = this.txtConcealedWorks.Text.Trim(); + newReport.ConcealedContentAndDiagram = this.txtConcealedContentAndDiagram.Text.Trim(); + newReport.InspectionResults = this.txtInspectionResults.Text.Trim(); + //newReport.Remark = this.txtRemark.Text.Trim(); + + if (!string.IsNullOrEmpty(this.RecordId)) + { + newReport.RecordId = this.RecordId; + BLL.ConcealedWorksInspectionRecordService.UpdateConcealedWorksInspectionRecord(newReport); + } + else + { + newReport.ProjectId = this.ProjectId; + newReport.CompileMan = this.CurrUser.UserId; + newReport.CompileDate = DateTime.Now; + newReport.Reviewer = this.CurrUser.UserId; + newReport.RevieweDate = DateTime.Now; + newReport.RecordId = SQLHelper.GetNewID(typeof(Model.JGZL_ConcealedWorksInspectionRecord)); + this.RecordId = newReport.RecordId; + BLL.ConcealedWorksInspectionRecordService.AddConcealedWorksInspectionRecord(newReport); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = string.Empty; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + string filePath = string.Empty; + + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) + { + initTemplatePath = Const.JGZL_ConcealedWorksInspectionRecordUrl; + uploadfilepath = rootPath + initTemplatePath; + + newUrl = uploadfilepath.Replace("隐蔽工程验收记录导出模板", "隐蔽工程验收记录"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } + File.Copy(uploadfilepath, newUrl); + Document doc = new Aspose.Words.Document(uploadfilepath); + + Bookmark projectName = doc.Range.Bookmarks["ProjectName"]; + if (projectName != null) + { + projectName.Text = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName; + } + Bookmark concealedWorks = doc.Range.Bookmarks["ConcealedWorks"]; + if (concealedWorks != null) + { + concealedWorks.Text = this.txtConcealedWorks.Text; + } + Bookmark drawingNumber = doc.Range.Bookmarks["DrawingNumber"]; + if (drawingNumber != null) + { + drawingNumber.Text = this.txtDrawingNumber.Text; + } + Bookmark concealedContentAndDiagram = doc.Range.Bookmarks["ConcealedContentAndDiagram"]; + if (concealedContentAndDiagram != null) + { + concealedContentAndDiagram.Text = this.txtConcealedContentAndDiagram.Text; + } + Bookmark inspectionResults = doc.Range.Bookmarks["InspectionResults"]; + if (inspectionResults != null) + { + inspectionResults.Text = this.txtInspectionResults.Text; + } + doc.Save(newUrl); + + 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); + return; + } } #endregion } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs index 0e1c114..75697c5 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.designer.cs @@ -105,13 +105,13 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.ToolbarFill ToolbarFill1; /// - /// btnAdd 控件。 + /// btnSave 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnAdd; + protected global::FineUIPro.Button btnSave; /// /// btnPrint 控件。 @@ -123,49 +123,58 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.Button btnPrint; /// - /// Grid1 控件。 + /// btnOut 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid Grid1; + protected global::FineUIPro.Button btnOut; /// - /// ToolbarSeparator1 控件。 + /// SimpleForm1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + protected global::FineUIPro.Form SimpleForm1; /// - /// ToolbarText1 控件。 + /// txtConcealedWorks 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarText ToolbarText1; + protected global::FineUIPro.TextBox txtConcealedWorks; /// - /// ddlPageSize 控件。 + /// txtDrawingNumber 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlPageSize; + protected global::FineUIPro.TextBox txtDrawingNumber; /// - /// Window1 控件。 + /// txtConcealedContentAndDiagram 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Window Window1; + protected global::FineUIPro.TextArea txtConcealedContentAndDiagram; + + /// + /// txtInspectionResults 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtInspectionResults; /// /// WindowPrint 控件。 @@ -175,32 +184,5 @@ namespace FineUIPro.Web.JGZL /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowPrint; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuEdit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx index d3a3a94..17dcdd3 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx @@ -75,7 +75,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs index 2215a1a..0f267d4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspection.aspx.cs @@ -79,6 +79,7 @@ namespace FineUIPro.Web.JGZL /// private void DataInfo() { + this.QualityControlPointInspectionId = string.Empty; txtProfessional.Text = string.Empty; txtConstructionStandards.Text = string.Empty; txtControlPointName.Text = string.Empty; @@ -104,6 +105,8 @@ namespace FineUIPro.Web.JGZL { this.txtProfessional.Text = "管道安装工程"; this.txtConstructionStandards.Text = "SH/T3501-2021"; + this.txtControlPointName.Text = "管道安装整体质量控制"; + this.txtCheckContents.Text = "1、经检查该管道安装下料尺寸精准，切口平整、无毛刺、无裂纹；坡口形式、角度、钝边厚度符合焊接工艺要求，坡口表面清洁无油污、铁锈、杂质，偏差均控制在规范允许范围内；\r\n2、该管道组对间隙、错边量符合规范要求，同轴度达标；严格按照审批通过的焊接工艺施焊，焊工均持证上岗，焊接参数合规，焊缝外观无咬边、气孔、夹渣、未焊透等缺陷；\r\n3、该管道的安装坐标、标高、坡度精准复核，符合设计图纸要求，坡度方向适配介质输送需求，偏差均在规范允许范围内且安装位置无偏移、无错位；\r\n4、该管线的支吊架材质、规格、安装位置、间距符合设计及规范要求，安装牢固、平整，无松动、歪斜；固定支吊架、滑动支吊架类型适配，不妨碍管道热胀冷缩，焊接部位饱满无缺陷；\r\n5、焊缝外观质量验收合格，无各类表面缺陷；按设计及规范要求比例进行RT、UT、MT、PT等无损检测，检测报告完整，不合格焊缝及时返修，返修后重新检测合格；\r\n6、该管道按照设计要求使用水压行强度试验，试验压力及稳压时间达标，无渗漏、无变形、无异常声响；严密性试验压力合规，全线检查无渗漏。"; } } }