From 0e66fec5163081744db817a0b8aa4cda319237a1 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 24 Apr 2024 17:11:15 +0800 Subject: [PATCH] =?UTF-8?q?20240424=20=E8=B4=A8=E9=87=8F=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comprehensive/MajorPlanApprovalService.cs | 1 + .../CQMS/Comprehensive/PressurePipeService.cs | 1 + .../Comprehensive/QualityAccidentService.cs | 1 + .../Comprehensive/SpecialEquipmentService.cs | 1 + SGGL/BLL/Common/Const.cs | 21 + .../DataReceivingDocDataIn.aspx.cs | 2 + .../DataReceivingDocDataInEdit.aspx | 94 ---- .../DataReceivingDocDataInEdit.aspx.cs | 347 ------------ ...ataReceivingDocDataInEdit.aspx.designer.cs | 258 --------- .../DesignChangeOrderDataIn.aspx.cs | 1 + .../DesignChangeOrderEdit.aspx.cs | 6 +- .../Comprehensive/DesignDetailsDataIn.aspx.cs | 3 + .../Comprehensive/DesignDetailsEdit.aspx.cs | 24 +- .../DesignDrawingsDataIn.aspx.cs | 4 + .../Comprehensive/DesignDrawingsEdit.aspx.cs | 6 +- .../InspectionEquipmentDataIn.aspx.cs | 2 + .../InspectionEquipmentEdit.aspx.cs | 14 +- .../InspectionMachineDataIn.aspx.cs | 6 +- .../InspectionMachineEdit.aspx.cs | 14 +- .../InspectionPersonDataIn.aspx.cs | 2 + .../InspectionPersonEdit.aspx.cs | 14 +- .../CQMS/Comprehensive/MajorPlanApproval.aspx | 6 + .../Comprehensive/MajorPlanApproval.aspx.cs | 16 + .../MajorPlanApproval.aspx.designer.cs | 18 + .../MajorPlanApprovalDataIn.aspx | 68 +++ .../MajorPlanApprovalDataIn.aspx.cs | 483 +++++++++++++++++ ... MajorPlanApprovalDataIn.aspx.designer.cs} | 65 +-- .../Comprehensive/MajorPlanApprovalEdit.aspx | 2 +- .../Comprehensive/NCRManagementDataIn.aspx.cs | 3 +- .../Comprehensive/NCRManagementEdit.aspx.cs | 33 +- .../CQMS/Comprehensive/PressurePipe.aspx | 20 +- .../CQMS/Comprehensive/PressurePipe.aspx.cs | 16 + .../PressurePipe.aspx.designer.cs | 64 ++- .../Comprehensive/PressurePipeDataIn.aspx | 68 +++ .../Comprehensive/PressurePipeDataIn.aspx.cs | 500 ++++++++++++++++++ .../PressurePipeDataIn.aspx.designer.cs | 123 +++++ .../CQMS/Comprehensive/QualityAccident.aspx | 6 + .../Comprehensive/QualityAccident.aspx.cs | 16 + .../QualityAccident.aspx.designer.cs | 62 ++- .../Comprehensive/QualityAccidentDataIn.aspx | 68 +++ .../QualityAccidentDataIn.aspx.cs | 450 ++++++++++++++++ .../QualityAccidentDataIn.aspx.designer.cs | 123 +++++ .../Comprehensive/QualityAccidentEdit.aspx | 2 +- .../Comprehensive/QualityAccidentEdit.aspx.cs | 6 +- .../Comprehensive/ReviewDrawingsEdit.aspx.cs | 6 +- .../SiteVisaManagementEdit.aspx.cs | 6 +- .../CQMS/Comprehensive/SpecialEquipment.aspx | 6 + .../Comprehensive/SpecialEquipment.aspx.cs | 16 + .../SpecialEquipment.aspx.designer.cs | 66 ++- .../Comprehensive/SpecialEquipmentDataIn.aspx | 68 +++ .../SpecialEquipmentDataIn.aspx.cs | 497 +++++++++++++++++ .../SpecialEquipmentDataIn.aspx.designer.cs | 123 +++++ .../TrainingRecordsDataInEdit.aspx | 66 --- .../TrainingRecordsDataInEdit.aspx.cs | 175 ------ SGGL/FineUIPro.Web/ErrLog.txt | 136 ----- .../Excel/DataIn/压力管道管理导入模板.xls | Bin 0 -> 19456 bytes .../Excel/DataIn/特种设备管理导入模板.xls | Bin 0 -> 19456 bytes .../Excel/DataIn/质量事故处理记录导入模板.xls | Bin 0 -> 19456 bytes .../超过一定规模的危大施工方案导入模板.xls | Bin 0 -> 19456 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 48 +- 60 files changed, 2964 insertions(+), 1289 deletions(-) delete mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx delete mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.cs delete mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs rename SGGL/FineUIPro.Web/CQMS/Comprehensive/{TrainingRecordsDataInEdit.aspx.designer.cs => MajorPlanApprovalDataIn.aspx.designer.cs} (66%) create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeDataIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeDataIn.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentDataIn.aspx.designer.cs delete mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx delete mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/压力管道管理导入模板.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/特种设备管理导入模板.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/超过一定规模的危大施工方案导入模板.xls 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 0000000000000000000000000000000000000000..7ac810b6d38d81baa616786eec3a03ee58de4aa9 GIT binary patch literal 19456 zcmeHP2V4}%((hdsSdwH^Kv)C?0m&eW62%-qj1NRWqM~9#P&qgSF>nSji&?~Q=A1EN z02LIocVK!dXFlXi>{m6z?9Rqhzx#dP@7}v!dS<%1>fhDX)jiYQGhDr*U%hshX$_GI zzC?vI2sMZri_U>-j8xDgL;x3OxkY7OnC0+9z%6(Y8|Iz&E1 z4Tzc$wIFIk)PdLpqAo;m0iqAl0HPs8BZ$TjO&~Uf*bHKGh^7$DAeuvL0nq}YB}DWa zj4k2XhL!#sneT6}YCkdteiNWC2b0lo9!JulCB8nGfX6UK;DVTdk4HjEs3Yk@pXj5@ znZTToZf;JOaFN{niqu>`!*}glpLOf*?q)Z@5a6K9Y6a>4* z`eWby+VZhKQv)}gH2Bbq)l|t5opSY)SsbDUoxg@~$xhx$I1=&zVgyNne$NRYv7lxW zsFOs-Q?7yvV)F_9`VdIz5Y0gyO2ELKIBK9W7wp`e(hJ%hatx{C4vOn2b?iiqMucqd z`pC>1IIyCFx&9R2Pt>s`b!-Ah4mm){+@UD0Fn+xTeqrW(Y)~=-EITJWtS{2<{Y7-d z*Ca<#bqRdBTv+vz_(=Ct!0)MmuAzYLsQ{m^fL~t$zn%hmM+I~Z1$4d?-Gb);z1)y+T9U_btFtDK z5Uq&|@gX!Ng0y8(EqI=A18yddJ)HC-anK2eDiCZ3ckSk~f=*DDqSEL*3tj-+>@5_F zDleGdjc|q$L8F59a3!uU(tU_zu4LWiakK>Mw4|hHS%2!pggc)oln9W{fiy+`oyky6$AMfPzal!K%H#h}rgNxy0@e@%ZBGJDPTAoP znkuF{Dxhm9ptn�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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/特种设备管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/特种设备管理导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..179fb419ef67c43906d42e751a2dbb1661757e57 GIT binary patch literal 19456 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 X2AV72VswKXU!b|cNBCIAe`oj~wTWx; literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/质量事故处理记录导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..b9fbd11e77e39bf9f9443b8699fe0282d5aa1884 GIT binary patch literal 19456 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 literal 0 HcmV?d00001 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