diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index 81a3cf58..74d664ec 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -121,6 +121,7 @@ namespace BLL newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan; newMajorPlanApproval.IsReview = majorPlanApproval.IsReview; + newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode; db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval); db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs index 61db5b1a..6c4dc9ed 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs @@ -102,6 +102,7 @@ namespace BLL newPressurePipe.CompileMan = PressurePipe.CompileMan; newPressurePipe.Status = PressurePipe.Status; newPressurePipe.ReportTime = PressurePipe.ReportTime; + newPressurePipe.RemarkCode = PressurePipe.RemarkCode; db.Comprehensive_PressurePipe.InsertOnSubmit(newPressurePipe); db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs index 1ccae107..406f17bf 100644 --- a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs @@ -101,6 +101,7 @@ namespace BLL newQualityAccident.CompileDate = QualityAccident.CompileDate; newQualityAccident.UnitWorkId = QualityAccident.UnitWorkId; newQualityAccident.Status = QualityAccident.Status; + newQualityAccident.RemarkCode = QualityAccident.RemarkCode; db.Comprehensive_QualityAccident.InsertOnSubmit(newQualityAccident); db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs index a3f7f589..67a8835c 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs @@ -106,6 +106,7 @@ namespace BLL newEquipment.CompileMan = SpecialEquipment.CompileMan; newEquipment.Status = SpecialEquipment.Status; newEquipment.PositionNum = SpecialEquipment.PositionNum; + newEquipment.RemarkCode = SpecialEquipment.RemarkCode; db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment); db.SubmitChanges(); } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index d6385fae..7b67ede0 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3275,6 +3275,27 @@ namespace BLL /// 施工组织设计及施工方案导入模板文件原始虚拟路径 /// public const string GeneralPlanApprovalTemplateUrl = "File\\Excel\\DataIn\\施工组织设计及施工方案导入模板.xls"; + + /// + /// 超过一定规模的危大施工方案导入模板文件原始虚拟路径 + /// + public const string MajorPlanApprovalTemplateUrl = "File\\Excel\\DataIn\\超过一定规模的危大施工方案导入模板.xls"; + + /// + /// 特种设备管理导入模板原始虚拟路径 + /// + public const string SpecialEquipmentTemplateUrl = "File\\Excel\\DataIn\\特种设备管理导入模板.xls"; + + /// + /// 压力管道管理导入模板原始虚拟路径 + /// + public const string PressurePipeTemplateUrl = "File\\Excel\\DataIn\\压力管道管理导入模板.xls"; + + /// + /// 质量事故处理记录导入模板原始虚拟路径 + /// + public const string QualityAccidentTemplateUrl = "File\\Excel\\DataIn\\质量事故处理记录导入模板.xls"; + #endregion #region 绩效考核模板文件路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs index 3f9394bb..23d81ee1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs @@ -570,6 +570,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } des.RemarkCode = pds.Rows[i][19].ToString().Trim(); + des.CompileMan = this.CurrUser.UserId; + des.CompileDate = DateTime.Now; BLL.DataReceivingDocService.AddDataReceivingDoc(des); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx deleted file mode 100644 index 3eb9f78e..00000000 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx +++ /dev/null @@ -1,94 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataReceivingDocDataInEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.DataReceivingDocDataInEdit" %> - - - - - - - 编辑导入资料收发文登记记录 - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.cs deleted file mode 100644 index 01bab778..00000000 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.cs +++ /dev/null @@ -1,347 +0,0 @@ -using BLL; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.CQMS.Comprehensive -{ - public partial class DataReceivingDocDataInEdit : PageBase - { - #region 定义项 - /// - /// 临时表主键 - /// - public string TempId - { - get - { - return (string)ViewState["TempId"]; - } - set - { - ViewState["TempId"] = value; - } - } - #endregion - - #region 加载页面 - /// - /// 加载页面 - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!IsPostBack) - { - this.TempId = Request.Params["TempId"]; - this.txtValue1.Focus(); - var dataInTemp = BLL.Sys_DataTempService.GetDataInTempByTempId(this.TempId); - if (dataInTemp != null) - { - this.txtValue1.Text = dataInTemp.Value1; - this.txtValue2.Text = dataInTemp.Value2; - this.txtValue3.Text = dataInTemp.Value3; - this.txtValue4.Text = dataInTemp.Value4; - this.txtValue5.Text = dataInTemp.Value5; - this.txtValue6.Text = dataInTemp.Value6; - this.txtValue7.Text = dataInTemp.Value7; - this.txtValue8.Text = dataInTemp.Value8; - this.txtValue9.Text = dataInTemp.Value9; - this.txtValue10.Text = dataInTemp.Value10; - this.txtValue11.Text = dataInTemp.Value11; - this.txtValue12.Text = dataInTemp.Value12; - this.txtValue13.Text = dataInTemp.Value13; - this.txtValue14.Text = dataInTemp.Value14; - this.txtValue15.Text = dataInTemp.Value15; - this.txtValue16.Text = dataInTemp.Value16; - this.txtValue17.Text = dataInTemp.Value17; - this.txtValue18.Text = dataInTemp.Value18; - this.txtValue19.Text = dataInTemp.Value19; - - this.lbErrCout.Text = dataInTemp.ToopValue; - } - } - } - #endregion - - #region 保存按钮 - /// - /// 保存按钮 - /// - /// - /// - protected void btnSave_Click(object sender, EventArgs e) - { - var dataInTemp = BLL.Sys_DataTempService.GetDataInTempByTempId(this.TempId); - if (this.ckAll.Checked) - { - var allDataInTemp = from x in Funs.DB.Sys_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId select x; - if (dataInTemp.Value1 != this.txtValue1.Text.Trim()) - { - var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null)); - if (tempValue1 != null) - { - foreach (var item in tempValue1) - { - item.Value1 = this.txtValue1.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value2 != this.txtValue2.Text.Trim()) - { - var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null)); - if (tempValue2 != null) - { - foreach (var item in tempValue2) - { - item.Value2 = this.txtValue2.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value3 != this.txtValue3.Text.Trim()) - { - var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null)); - if (tempValue3 != null) - { - foreach (var item in tempValue3) - { - item.Value3 = this.txtValue3.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value5 != this.txtValue5.Text.Trim()) - { - var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null)); - if (tempValue5 != null) - { - foreach (var item in tempValue5) - { - item.Value5 = this.txtValue5.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value6 != this.txtValue6.Text.Trim()) - { - var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null)); - if (tempValue6 != null) - { - foreach (var item in tempValue6) - { - item.Value6 = this.txtValue6.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value7 != this.txtValue7.Text.Trim()) - { - var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null)); - if (tempValue7 != null) - { - foreach (var item in tempValue7) - { - item.Value7 = this.txtValue7.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value8 != this.txtValue8.Text.Trim()) - { - var tempValue8 = allDataInTemp.Where(x => x.Value8 == dataInTemp.Value8 || (x.Value8 == null && dataInTemp.Value8 == null)); - if (tempValue8 != null) - { - foreach (var item in tempValue8) - { - item.Value8 = this.txtValue8.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value9 != this.txtValue9.Text.Trim()) - { - var tempValue9 = allDataInTemp.Where(x => x.Value9 == dataInTemp.Value9 || (x.Value9 == null && dataInTemp.Value9 == null)); - if (tempValue9 != null) - { - foreach (var item in tempValue9) - { - item.Value9 = this.txtValue9.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value10 != this.txtValue10.Text.Trim()) - { - var tempValue10 = allDataInTemp.Where(x => x.Value10 == dataInTemp.Value10 || (x.Value10 == null && dataInTemp.Value10 == null)); - if (tempValue10 != null) - { - foreach (var item in tempValue10) - { - item.Value10 = this.txtValue10.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value11 != this.txtValue11.Text.Trim()) - { - var tempValue11 = allDataInTemp.Where(x => x.Value11 == dataInTemp.Value11 || (x.Value11 == null && dataInTemp.Value11 == null)); - if (tempValue11 != null) - { - foreach (var item in tempValue11) - { - item.Value11 = this.txtValue11.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value12 != this.txtValue12.Text.Trim()) - { - var tempValue12 = allDataInTemp.Where(x => x.Value12 == dataInTemp.Value12 || (x.Value12 == null && dataInTemp.Value12 == null)); - if (tempValue12 != null) - { - foreach (var item in tempValue12) - { - item.Value12 = this.txtValue12.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value13 != this.txtValue13.Text.Trim()) - { - var tempValue13 = allDataInTemp.Where(x => x.Value13 == dataInTemp.Value13 || (x.Value13 == null && dataInTemp.Value13 == null)); - if (tempValue13 != null) - { - foreach (var item in tempValue13) - { - item.Value13 = this.txtValue13.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value14 != this.txtValue14.Text.Trim()) - { - var tempValue14 = allDataInTemp.Where(x => x.Value14 == dataInTemp.Value14 || (x.Value14 == null && dataInTemp.Value14 == null)); - if (tempValue14 != null) - { - foreach (var item in tempValue14) - { - item.Value14 = this.txtValue14.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value15 != this.txtValue15.Text.Trim()) - { - var tempValue15 = allDataInTemp.Where(x => x.Value15 == dataInTemp.Value15 || (x.Value15 == null && dataInTemp.Value15 == null)); - if (tempValue15 != null) - { - foreach (var item in tempValue15) - { - item.Value15 = this.txtValue15.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value16 != this.txtValue16.Text.Trim()) - { - var tempValue16 = allDataInTemp.Where(x => x.Value16 == dataInTemp.Value16 || (x.Value16 == null && dataInTemp.Value16 == null)); - if (tempValue16 != null) - { - foreach (var item in tempValue16) - { - item.Value16 = this.txtValue16.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value17 != this.txtValue17.Text.Trim()) - { - var tempValue17 = allDataInTemp.Where(x => x.Value17 == dataInTemp.Value17 || (x.Value17 == null && dataInTemp.Value17 == null)); - if (tempValue17 != null) - { - foreach (var item in tempValue17) - { - item.Value17 = this.txtValue17.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value18 != this.txtValue18.Text.Trim()) - { - var tempValue18 = allDataInTemp.Where(x => x.Value18 == dataInTemp.Value18 || (x.Value18 == null && dataInTemp.Value18 == null)); - if (tempValue18 != null) - { - foreach (var item in tempValue18) - { - item.Value18 = this.txtValue18.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value19 != this.txtValue19.Text.Trim()) - { - var tempValue19 = allDataInTemp.Where(x => x.Value19 == dataInTemp.Value19 || (x.Value19 == null && dataInTemp.Value19 == null)); - if (tempValue19 != null) - { - foreach (var item in tempValue19) - { - item.Value19 = this.txtValue19.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue); - if (toopValue != null) - { - foreach (var item in toopValue) - { - item.ToopValue = null; - Funs.DB.SubmitChanges(); - } - } - } - else - { - Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); - newDataInTemp.ProjectId = this.CurrUser.LoginProjectId; - newDataInTemp.UserId = this.CurrUser.UserId; - newDataInTemp.Time = System.DateTime.Now; - newDataInTemp.Type = dataInTemp.Type; - newDataInTemp.Value1 = this.txtValue1.Text.Trim(); - newDataInTemp.Value2 = this.txtValue2.Text.Trim(); - newDataInTemp.Value3 = this.txtValue3.Text.Trim(); - newDataInTemp.Value4 = this.txtValue4.Text.Trim(); - newDataInTemp.Value5 = this.txtValue5.Text.Trim(); - newDataInTemp.Value6 = this.txtValue6.Text.Trim(); - newDataInTemp.Value7 = this.txtValue7.Text.Trim(); - newDataInTemp.Value8 = this.txtValue8.Text.Trim(); - newDataInTemp.Value9 = this.txtValue9.Text.Trim(); - newDataInTemp.Value10 = this.txtValue10.Text.Trim(); - newDataInTemp.Value11 = this.txtValue11.Text.Trim(); - newDataInTemp.Value12 = this.txtValue12.Text.Trim(); - newDataInTemp.Value13 = this.txtValue13.Text.Trim(); - newDataInTemp.Value14 = this.txtValue14.Text.Trim(); - newDataInTemp.Value15 = this.txtValue15.Text.Trim(); - newDataInTemp.Value16 = this.txtValue16.Text.Trim(); - newDataInTemp.Value17 = this.txtValue17.Text.Trim(); - newDataInTemp.Value18 = this.txtValue18.Text.Trim(); - newDataInTemp.Value19 = this.txtValue19.Text.Trim(); - if (!string.IsNullOrEmpty(this.TempId)) - { - newDataInTemp.TempId = this.TempId; - newDataInTemp.ToopValue = null; - BLL.Sys_DataTempService.UpdateDataInTemp(newDataInTemp); - } - } - ShowNotify("信息修改完成！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - } - #endregion - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.designer.cs deleted file mode 100644 index a3820a97..00000000 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.designer.cs +++ /dev/null @@ -1,258 +0,0 @@ -//------------------------------------------------------------------------------ -// <自动生成> -// 此代码由工具生成。 -// -// 对此文件的更改可能导致不正确的行为，如果 -// 重新生成代码，则所做更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class DataReceivingDocDataInEdit { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// PageManager1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.PageManager PageManager1; - - /// - /// SimpleForm1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form SimpleForm1; - - /// - /// Toolbar1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar1; - - /// - /// ToolbarFill1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarFill ToolbarFill1; - - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - - /// - /// txtValue1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue1; - - /// - /// txtValue2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue2; - - /// - /// txtValue3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue3; - - /// - /// txtValue4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue4; - - /// - /// txtValue5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue5; - - /// - /// txtValue6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue6; - - /// - /// txtValue7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue7; - - /// - /// txtValue8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue8; - - /// - /// txtValue9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue9; - - /// - /// txtValue10 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtValue10; - - /// - /// txtValue11 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue11; - - /// - /// txtValue12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue12; - - /// - /// txtValue13 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue13; - - /// - /// txtValue14 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue14; - - /// - /// txtValue15 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue15; - - /// - /// txtValue16 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue16; - - /// - /// txtValue17 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue17; - - /// - /// txtValue18 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue18; - - /// - /// txtValue19 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtValue19; - - /// - /// ckAll 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.CheckBox ckAll; - - /// - /// lbErrCout 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea lbErrCout; - } -} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs index 2c75e04f..ad5bb5b3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs @@ -452,6 +452,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; + Ins.Status = BLL.Const.Comprehensive_Compile; BLL.DesignChangeOrderService.AddDesignChangeOrder(Ins); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index eb66fad6..5a8e65c1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -443,13 +443,13 @@ 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 == null || ((designChangeOrder.CompileMan == CurrUser.UserId && designChangeOrder.Status == BLL.Const.Comprehensive_Compile) || (designChangeOrder.CompileMan == CurrUser.UserId && designChangeOrder.Status == BLL.Const.Comprehensive_ReCompile))) + if (designChangeOrder.Status == BLL.Const.Comprehensive_Complete) { - 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))); + 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=-1&toKeyId={0}&path=FileUpload/CQMS/DesignChangeOrder&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignChangeOrderMenuId))); + 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/DesignDetailsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs index 6538174f..27ff5bae 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs @@ -431,6 +431,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive } des.JoinPersonNum = Funs.GetNewInt(pds.Rows[i][6].ToString().Trim()); des.RemarCode = pds.Rows[i][7].ToString().Trim(); + des.CompileMan = this.CurrUser.UserId; + des.CompileDate = DateTime.Now; + des.Status = BLL.Const.Comprehensive_Compile; BLL.DesignDetailsService.AddDesignDetails(des); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index 592da456..93880fce 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive LoadAuditSelect(); this.agree.Hidden = true; this.options.Hidden = true; - + this.btnSave.Hidden = true; this.btnSubmit.Hidden = true; this.DesignDetailsId = Request.Params["DesignDetailsId"]; @@ -72,7 +72,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString(); } var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit); - if (auditApprove!=null) + if (auditApprove != null) { drpAudit.SelectedValue = auditApprove.ApproveMan; @@ -89,7 +89,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive }//审核状态 审核人 可以显示 提交 保存按钮 else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId) { - + //审核状态不可编辑 Readonly(); @@ -131,11 +131,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtDetailsMan.Readonly = true; this.drpUnitIds.Readonly = true; this.drpUnitWorks.Readonly = true; - + this.drpAudit.Readonly = true; - + //this.btnAttach.Enabled = false; - + } /// @@ -237,11 +237,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive designDetails.DesignDetailsId = this.DesignDetailsId; var model = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault(); if (model != null) - { + { designDetails.Status = model.Status; } BLL.DesignDetailsService.UpdateDesignDetails(designDetails); - } + } ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } @@ -399,7 +399,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive reApprove.ApproveDate = DateTime.Now.AddSeconds(10); reApprove.ApproveMan = CurrUser.UserId; reApprove.ApproveType = Const.Comprehensive_Complete; - // reApprove.ApproveIdea = txtidea.Text; + // reApprove.ApproveIdea = txtidea.Text; DesignDetailsApproveService.EditApprove(reApprove); } else @@ -439,14 +439,14 @@ 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 == null || ((designDetails.CompileMan == CurrUser.UserId && designDetails.Status == BLL.Const.Comprehensive_Compile) || (designDetails.CompileMan == CurrUser.UserId && designDetails.Status == BLL.Const.Comprehensive_ReCompile))) + if (designDetails.Status == BLL.Const.Comprehensive_Complete) { - 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))); + 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=-1&toKeyId={0}&path=FileUpload/CQMS/designDetails&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDetailsMenuId))); + 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/DesignDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs index 10c4bd77..8faf6310 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs @@ -460,6 +460,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive } des.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 des.Remark = pds.Rows[i][11].ToString().Trim();//备注 + des.Status = BLL.Const.Comprehensive_Compile; + des.CompileMan = this.CurrUser.UserId; BLL.DesignDrawingsService.AddDesignDrawings(des); } else @@ -491,6 +493,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive } oldViewInfo.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();//备注 + oldViewInfo.CompileMan = this.CurrUser.UserId; + oldViewInfo.Status = BLL.Const.Comprehensive_Compile; BLL.DesignDrawingsService.UpdateDesignDrawings(oldViewInfo); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index 638aca3c..dc9ddf73 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -437,13 +437,13 @@ 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 == null || ((designDrawings.CompileMan == CurrUser.UserId && designDrawings.Status == BLL.Const.Comprehensive_Compile) || (designDrawings.CompileMan == CurrUser.UserId && designDrawings.Status == BLL.Const.Comprehensive_ReCompile))) + if (designDrawings.Status == BLL.Const.Comprehensive_Complete) { - 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))); + 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=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DesignDrawingsMenuId))); + 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/InspectionEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs index e97ff55f..14c8aaa7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs @@ -425,6 +425,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; + Ins.Status = BLL.Const.Comprehensive_Complete; BLL.InspectionEquipmentService.AddInspectionEquipment(Ins); } @@ -453,6 +454,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oldViewInfo.RemarkCode = pds.Rows[i][12].ToString().Trim(); oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; + oldViewInfo.Status = BLL.Const.Comprehensive_Complete; BLL.InspectionEquipmentService.UpdateInspectionEquipment(oldViewInfo); //result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index b882db8e..71cd5db1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -495,14 +495,14 @@ 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 == null || ((oldInspectionEquipment.CompileMan == CurrUser.UserId && oldInspectionEquipment.Status == BLL.Const.Comprehensive_Compile) || (oldInspectionEquipment.CompileMan == CurrUser.UserId && oldInspectionEquipment.Status == BLL.Const.Comprehensive_ReCompile))) - //{ + 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))); - //} - //else - //{ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId))); - //} + } } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs index 02b1053e..edb33d3f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs @@ -490,6 +490,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; + Ins.Status = BLL.Const.Comprehensive_Compile; BLL.InspectionMachineService.AddInspectionMachine(Ins); } else @@ -540,11 +541,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; + oldViewInfo.Status = BLL.Const.Comprehensive_Compile; BLL.InspectionMachineService.UpdateInspectionMachine(oldViewInfo); - } - + } } - else { result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index 690b7c73..6887a102 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -433,14 +433,14 @@ 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 == null || ((inspectionMachine.CompileMan == CurrUser.UserId && inspectionMachine.Status == BLL.Const.Comprehensive_Compile) || (inspectionMachine.CompileMan == CurrUser.UserId && inspectionMachine.Status == BLL.Const.Comprehensive_ReCompile))) - //{ + 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))); - //} - //else - //{ - // 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))); - //} + } } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs index a70751ce..3062cee1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs @@ -479,6 +479,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; + Ins.Status = BLL.Const.Comprehensive_Compile; Ins.IsTrain = true; BLL.InspectionPersonService.AddInspectionPerson(Ins); if (pds.Rows[i][4].ToString().Trim() == "焊工") @@ -537,6 +538,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; + oldViewInfo.Status = BLL.Const.Comprehensive_Compile; oldViewInfo.IsTrain = true; BLL.InspectionPersonService.UpdateInspectionPerson(oldViewInfo); if (pds.Rows[i][4].ToString().Trim() == "焊工") diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index ad5dcbeb..7e54e94c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -669,14 +669,14 @@ 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 == null || ((inspectionPerson.CompileMan == CurrUser.UserId && inspectionPerson.Status == BLL.Const.Comprehensive_Compile) || (inspectionPerson.CompileMan == CurrUser.UserId && inspectionPerson.Status == BLL.Const.Comprehensive_ReCompile))) - //{ + 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))); - //} - //else - //{ - // 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))); - //} + } } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx index 5a8446de..2d658334 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx @@ -32,6 +32,8 @@ + @@ -105,6 +107,10 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Width="900px" Height="460px"> + + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("SpecialEquipmentDataIn.aspx", "导入 - "))); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs index 00bc76c1..29610405 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Comprehensive -{ - - - public partial class SpecialEquipment - { - +namespace FineUIPro.Web.Comprehensive { + + + public partial class SpecialEquipment { + /// /// 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; - + /// /// drpEquipmentId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpEquipmentId; - + /// /// btnSearch 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -94,7 +92,16 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + /// /// lblPageIndex 控件。 /// @@ -103,7 +110,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// txtStatus 控件。 /// @@ -112,7 +119,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label txtStatus; - + /// /// lbtnFileUrl 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; - + /// /// ToolbarText1 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -148,7 +155,16 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + /// /// WindowAtt 控件。 /// @@ -157,7 +173,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -166,7 +182,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -175,7 +191,7 @@ namespace FineUIPro.Web.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx new file mode 100644 index 00000000..2d2ec8bb --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx @@ -0,0 +1,68 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SpecialEquipmentDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.SpecialEquipmentDataIn" %> + + + + + + + 导入特种设备管理 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.cs new file mode 100644 index 00000000..de168e7a --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.cs @@ -0,0 +1,497 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.OleDb; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.Comprehensive +{ + public partial class SpecialEquipmentDataIn : PageBase + { + #region 定义变量 + /// + /// 上传预设的虚拟路径 + /// + private string initPath = Const.ExcelUrl; + + + /// + /// 错误集合 + /// + public static List errorInfos = new List(); + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.hdCheckResult.Text = string.Empty; + this.hdFileName.Text = string.Empty; + if (errorInfos != null) + { + errorInfos.Clear(); + } + } + } + #endregion + + #region 审核 + /// + /// 审核 + /// + /// + /// + protected void btnAudit_Click(object sender, EventArgs e) + { + try + { + if (this.fuAttachUrl.HasFile == false) + { + ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls") + { + ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning); + return; + } + if (errorInfos != null) + { + errorInfos.Clear(); + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + + this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + string filePath = initFullPath + this.hdFileName.Text; + this.fuAttachUrl.PostedFile.SaveAs(filePath); + ImportXlsToData(rootPath + initPath + this.hdFileName.Text); + } + catch (Exception ex) + { + ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + + #region 读Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData(string fileName) + { + try + { + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + AddDatasetToSQL(ds.Tables[0], 9); + hdCheckResult.Text = "1"; + } + catch (Exception exc) + { + Response.Write(exc); + //return null; + // return dt; + } + finally + { + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集行数 + /// + private bool AddDatasetToSQL(DataTable pds, int Cols) + { + string result = string.Empty; + int ic, ir; + ic = pds.Columns.Count; + if (ic < Cols) + { + ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning); + return false; + } + + ir = pds.Rows.Count; + if (pds != null && ir > 0) + { + var oldViewInfos = from x in Funs.DB.Comprehensive_SpecialEquipment + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + + var units = from x in Funs.DB.Base_Unit + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.ProjectId == this.CurrUser.LoginProjectId + select x; + + var specialEquipments = from x in Funs.DB.Base_SpecialEquipment + where x.IsSpecial == true + select x; + + for (int i = 0; i < ir; i++) + { + string row0 = pds.Rows[i][0].ToString(); + if (string.IsNullOrEmpty(row0)) + { + result += (i + 2).ToString() + "," + "所属单位" + "," + "此项为必填项！" + "|"; + } + else + { + var unit = units.Where(x => x.UnitName == row0.Trim()).FirstOrDefault(); + if (unit == null) + { + result += (i + 2).ToString() + "," + "所属单位" + "," + "[" + row0 + "]不存在！" + "|"; + } + } + + string row1 = pds.Rows[i][1].ToString(); + if (string.IsNullOrEmpty(row1)) + { + result += (i + 2).ToString() + "," + "设备名称" + "," + "此项为必填项！" + "|"; + } + else + { + var cn = specialEquipments.Where(x => x.SpecialEquipmentName == row1.Trim()).FirstOrDefault(); + if (cn == null) + { + result += (i + 2).ToString() + "," + "设备名称" + "," + "[" + row1 + "]不存在！" + "|"; + } + } + + string row2 = pds.Rows[i][2].ToString(); + if (!string.IsNullOrEmpty(row2)) + { + try + { + int c = Convert.ToInt32(row2); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "总数量" + "," + "[" + row2 + "]错误！" + "|"; + } + } + + string row3 = pds.Rows[i][3].ToString(); + if (!string.IsNullOrEmpty(row3)) + { + try + { + int c = Convert.ToInt32(row3); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "告知数量" + "," + "[" + row3 + "]错误！" + "|"; + } + } + + string row4 = pds.Rows[i][4].ToString(); + if (!string.IsNullOrEmpty(row4)) + { + try + { + int c = Convert.ToInt32(row4); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "提交资料数量" + "," + "[" + row4 + "]错误！" + "|"; + } + } + + string row5 = pds.Rows[i][5].ToString(); + if (!string.IsNullOrEmpty(row5)) + { + try + { + int c = Convert.ToInt32(row5); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "监检报告数量" + "," + "[" + row5 + "]错误！" + "|"; + } + } + + string row7 = pds.Rows[i][7].ToString(); + if (!string.IsNullOrEmpty(row7)) + { + try + { + DateTime d = Convert.ToDateTime(row7); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "填报日期" + "," + "[" + row7 + "]错误！" + "|"; + } + } + + string row8 = pds.Rows[i][8].ToString(); + if (string.IsNullOrEmpty(row8)) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; + } + } + if (!string.IsNullOrEmpty(result)) + { + result = result.Substring(0, result.LastIndexOf("|")); + } + errorInfos.Clear(); + if (!string.IsNullOrEmpty(result)) + { + string results = result; + List errorInfoList = results.Split('|').ToList(); + foreach (var item in errorInfoList) + { + string[] errors = item.Split(','); + Model.ErrorInfo errorInfo = new Model.ErrorInfo(); + errorInfo.Row = errors[0]; + errorInfo.Column = errors[1]; + errorInfo.Reason = errors[2]; + errorInfos.Add(errorInfo); + } + if (errorInfos.Count > 0) + { + this.gvErrorInfo.DataSource = errorInfos; + this.gvErrorInfo.DataBind(); + } + } + else + { + ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success); + } + } + else + { + ShowNotify("导入数据为空！", MessageBoxIcon.Warning); + } + return true; + } + #endregion + #endregion + + #region 导入 + /// + /// 导入 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(hdCheckResult.Text)) + { + if (errorInfos.Count <= 0) + { + string rootPath = Server.MapPath("~/"); + ImportXlsToData2(rootPath + initPath + this.hdFileName.Text); + hdCheckResult.Text = string.Empty; + ShowNotify("导入成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning); + } + } + + #region Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData2(string fileName) + { + try + { + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + AddDatasetToSQL2(ds.Tables[0], 9); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集列数 + /// + private bool AddDatasetToSQL2(DataTable pds, int Cols) + { + int ic, ir; + ic = pds.Columns.Count; + if (ic < Cols) + { + ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning); + } + string result = string.Empty; + ir = pds.Rows.Count; + if (pds != null && ir > 0) + { + var oldViewInfos = from x in Funs.DB.Comprehensive_SpecialEquipment + where x.ProjectId == this.CurrUser.LoginProjectId + select x; + + var units = from x in Funs.DB.Base_Unit + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.ProjectId == this.CurrUser.LoginProjectId + select x; + + var specialEquipments = from x in Funs.DB.Base_SpecialEquipment + where x.IsSpecial == true + select x; + + for (int i = 0; i < ir; i++) + { + Model.Comprehensive_SpecialEquipment oldViewInfo = new Model.Comprehensive_SpecialEquipment(); + string row0 = pds.Rows[i][0].ToString().Trim(); + string row1 = pds.Rows[i][1].ToString().Trim(); + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][8].ToString().Trim() + ).FirstOrDefault(); + if (oldViewInfo == null) + { + Model.Comprehensive_SpecialEquipment des = new Model.Comprehensive_SpecialEquipment(); + des.SpecialEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment)); + des.ProjectId = this.CurrUser.LoginProjectId; + des.UnitId = units.Where(x => x.UnitName == row0.Trim()).FirstOrDefault().UnitId; + des.EquipmentId = specialEquipments.Where(x => x.SpecialEquipmentName == row1.Trim()).FirstOrDefault().SpecialEquipmentId; + des.SunNumber=Funs.GetNewInt(pds.Rows[i][2].ToString().Trim()); + des.InformNumber = Funs.GetNewInt(pds.Rows[i][3].ToString().Trim()); + des.SubmitDataNumber = Funs.GetNewInt(pds.Rows[i][4].ToString().Trim()); + des.MonitoringReportNumber = Funs.GetNewInt(pds.Rows[i][5].ToString().Trim()); + des.PositionNum = pds.Rows[i][6].ToString().Trim(); + des.ReportTime = Funs.GetNewDateTime(pds.Rows[i][7].ToString().Trim()); + des.RemarkCode = pds.Rows[i][8].ToString().Trim(); + des.CompileMan = this.CurrUser.UserId; + des.Status = BLL.Const.Comprehensive_Compile; + BLL.SpecialEquipmentServices.AddEquipment(des); + } + } + } + else + { + ShowNotify("导入数据为空！", MessageBoxIcon.Warning); + } + return true; + } + #endregion + #endregion + + #region 下载模板 + /// + /// 下载模板按钮 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 下载导入模板 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.SpecialEquipmentTemplateUrl; + string filePath = Const.SpecialEquipmentTemplateUrl; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.designer.cs new file mode 100644 index 00000000..39985905 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.designer.cs @@ -0,0 +1,123 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class SpecialEquipmentDataIn { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// hdFileName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdFileName; + + /// + /// btnAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAudit; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnDownLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoad; + + /// + /// hdCheckResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdCheckResult; + + /// + /// fuAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FileUpload fuAttachUrl; + + /// + /// gvErrorInfo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvErrorInfo; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx deleted file mode 100644 index 544fd18f..00000000 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx +++ /dev/null @@ -1,66 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainingRecordsDataInEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.TrainingRecordsDataInEdit" %> - - - - - - - 编辑培训记录导入 - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs deleted file mode 100644 index bcbfbac4..00000000 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs +++ /dev/null @@ -1,175 +0,0 @@ -using BLL; -using System; -using System.Linq; - -namespace FineUIPro.Web.CQMS.Comprehensive -{ - public partial class TrainingRecordsDataInEdit : PageBase - { - #region 定义项 - /// - /// 临时表主键 - /// - public string TempId - { - get - { - return (string)ViewState["TempId"]; - } - set - { - ViewState["TempId"] = value; - } - } - #endregion - - #region 加载页面 - /// - /// 加载页面 - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!IsPostBack) - { - this.TempId = Request.Params["TempId"]; - this.txtValue1.Focus(); - var dataInTemp = BLL.Sys_DataTempService.GetDataInTempByTempId(this.TempId); - if (dataInTemp != null) - { - this.txtValue1.Text = dataInTemp.Value1; - this.txtValue2.Text = dataInTemp.Value2; - this.txtValue3.Text = dataInTemp.Value3; - this.txtValue4.Text = dataInTemp.Value4; - this.txtValue5.Text = dataInTemp.Value5; - this.txtValue6.Text = dataInTemp.Value6; - this.txtValue7.Text = dataInTemp.Value7; - - this.lbErrCout.Text = dataInTemp.ToopValue; - } - } - } - #endregion - - #region 保存按钮 - /// - /// 保存按钮 - /// - /// - /// - protected void btnSave_Click(object sender, EventArgs e) - { - var dataInTemp = BLL.Sys_DataTempService.GetDataInTempByTempId(this.TempId); - if (this.ckAll.Checked) - { - var allDataInTemp = from x in Funs.DB.Sys_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId select x; - if (dataInTemp.Value1 != this.txtValue1.Text.Trim()) - { - var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null)); - if (tempValue1 != null) - { - foreach (var item in tempValue1) - { - item.Value1 = this.txtValue1.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value2 != this.txtValue2.Text.Trim()) - { - var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null)); - if (tempValue2 != null) - { - foreach (var item in tempValue2) - { - item.Value2 = this.txtValue2.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value3 != this.txtValue3.Text.Trim()) - { - var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null)); - if (tempValue3 != null) - { - foreach (var item in tempValue3) - { - item.Value3 = this.txtValue3.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value5 != this.txtValue5.Text.Trim()) - { - var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null)); - if (tempValue5 != null) - { - foreach (var item in tempValue5) - { - item.Value5 = this.txtValue5.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value6 != this.txtValue6.Text.Trim()) - { - var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null)); - if (tempValue6 != null) - { - foreach (var item in tempValue6) - { - item.Value6 = this.txtValue6.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - if (dataInTemp.Value7 != this.txtValue7.Text.Trim()) - { - var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null)); - if (tempValue7 != null) - { - foreach (var item in tempValue7) - { - item.Value7 = this.txtValue7.Text.Trim(); - Funs.DB.SubmitChanges(); - } - } - } - var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue); - if (toopValue != null) - { - foreach (var item in toopValue) - { - item.ToopValue = null; - Funs.DB.SubmitChanges(); - } - } - } - else - { - Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp(); - newDataInTemp.ProjectId = this.CurrUser.LoginProjectId; - newDataInTemp.UserId = this.CurrUser.UserId; - newDataInTemp.Time = System.DateTime.Now; - newDataInTemp.Type = dataInTemp.Type; - newDataInTemp.Value1 = this.txtValue1.Text.Trim(); - newDataInTemp.Value2 = this.txtValue2.Text.Trim(); - newDataInTemp.Value3 = this.txtValue3.Text.Trim(); - newDataInTemp.Value4 = this.txtValue4.Text.Trim(); - newDataInTemp.Value5 = this.txtValue5.Text.Trim(); - newDataInTemp.Value6 = this.txtValue6.Text.Trim(); - newDataInTemp.Value7 = this.txtValue7.Text.Trim(); - if (!string.IsNullOrEmpty(this.TempId)) - { - newDataInTemp.TempId = this.TempId; - newDataInTemp.ToopValue = null; - BLL.Sys_DataTempService.UpdateDataInTemp(newDataInTemp); - } - } - ShowNotify("信息修改完成！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - } - #endregion - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 5d41e68b..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,136 +0,0 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:过程或函数 'Sp_GJSX_getlist' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 276 - 在 FineUIPro.Web.PZHGL.GJSX.GJSXList.BindGrid() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\PZHGL\GJSX\GJSXList.aspx.cs:行号 60 - 在 FineUIPro.Web.PZHGL.GJSX.GJSXList.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\PZHGL\GJSX\GJSXList.aspx.cs:行号 35 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.EventHandler.Invoke(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:04/22/2024 11:27:38 -出错文件:http://localhost:8579/PZHGL/GJSX/GJSXList.aspx -IP地址:::1 -操作人员:JT - -出错时间:04/22/2024 11:27:38 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180 -出错时间:04/22/2024 13:27:34 -出错时间:04/22/2024 13:27:34 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045 -出错时间:04/22/2024 13:27:34 -出错时间:04/22/2024 13:27:34 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941 -出错时间:04/22/2024 13:27:34 -出错时间:04/22/2024 13:27:34 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883 -出错时间:04/22/2024 13:27:34 -出错时间:04/22/2024 13:27:34 - diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/压力管道管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/压力管道管理导入模板.xls new file mode 100644 index 00000000..7ac810b6 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/压力管道管理导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/特种设备管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/特种设备管理导入模板.xls new file mode 100644 index 00000000..179fb419 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/特种设备管理导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls new file mode 100644 index 00000000..b9fbd11e Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls new file mode 100644 index 00000000..748c5e91 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 004db80f..1697db4f 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -427,7 +427,6 @@ - @@ -461,6 +460,7 @@ + @@ -469,9 +469,11 @@ + + @@ -482,10 +484,10 @@ + - @@ -7371,13 +7373,6 @@ DataReceivingDocDataIn.aspx - - DataReceivingDocDataInEdit.aspx - ASPXCodeBehind - - - DataReceivingDocDataInEdit.aspx - DataReceivingDocEdit.aspx ASPXCodeBehind @@ -7609,6 +7604,13 @@ MajorPlanApproval.aspx + + MajorPlanApprovalDataIn.aspx + ASPXCodeBehind + + + MajorPlanApprovalDataIn.aspx + MajorPlanApprovalEdit.aspx ASPXCodeBehind @@ -7665,6 +7667,13 @@ PressurePipeApprove.aspx + + PressurePipeDataIn.aspx + ASPXCodeBehind + + + PressurePipeDataIn.aspx + PressurePipeEdit.aspx ASPXCodeBehind @@ -7686,6 +7695,13 @@ QualityAccidentApprove.aspx + + QualityAccidentDataIn.aspx + ASPXCodeBehind + + + QualityAccidentDataIn.aspx + QualityAccidentEdit.aspx ASPXCodeBehind @@ -7756,6 +7772,13 @@ SpecialEquipmentApprove.aspx + + SpecialEquipmentDataIn.aspx + ASPXCodeBehind + + + SpecialEquipmentDataIn.aspx + SpecialEquipmentEdit.aspx ASPXCodeBehind @@ -7777,13 +7800,6 @@ TrainingRecordsDataIn.aspx - - TrainingRecordsDataInEdit.aspx - ASPXCodeBehind - - - TrainingRecordsDataInEdit.aspx - TrainingRecordsEdit.aspx ASPXCodeBehind