From 39bcc852269d4fa8dac5c63396e8719ec54f42ef Mon Sep 17 00:00:00 2001 From: panhf <754998852@qq.com> Date: Thu, 18 Apr 2024 09:22:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From d1e5badc5ba2db939c0d9fdd1b8a03512eb0a4f6 Mon Sep 17 00:00:00 2001 From: panhf <754998852@qq.com> Date: Thu, 18 Apr 2024 10:00:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-04-18-phf.sql | 2 ++ .../Comprehensive/DesignChangeOrderEdit.aspx | 7 ++++++- .../DesignChangeOrderEdit.aspx.cs | 8 ++++---- .../DesignChangeOrderEdit.aspx.designer.cs | 4 ++-- .../CQMS/ManageReportNew/MonthReport.aspx.cs | 4 ++-- .../ManageReportNew/MonthReportEdit.aspx.cs | 4 ++-- .../File/Excel/DataIn/设计变更单导入模板.xls | Bin 20480 -> 19456 bytes .../File/Word/CQMS/项目质量月报.doc | Bin 65338 -> 66177 bytes 8 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql new file mode 100644 index 00000000..4b66579e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql @@ -0,0 +1,2 @@ +update Comprehensive_DesignChangeOrder set ImplementationFrontState='' where ImplementationFrontState like'%%'; +update Comprehensive_DesignChangeOrder set ImplementationFrontState='ʵʩ' where ImplementationFrontState !=''; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx index 70b4acc8..6cdfa08b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx @@ -42,7 +42,12 @@ - + <%----%> + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index 26ea6252..eb66fad6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -75,8 +75,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", designChangeOrder.CompleteDate); } - this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState; - + //this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState; + this.drpImplementationFrontState.SelectedValue= designChangeOrder.ImplementationFrontState; var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId); @@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text); designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); - designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim(); + designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) { designChangeOrder.AuditMan = drpAudit.SelectedValue; @@ -273,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text); designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); - designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim(); + designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) { designChangeOrder.AuditMan = drpAudit.SelectedValue; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs index 0bf36a10..5f560bc1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs @@ -114,13 +114,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive protected global::FineUIPro.DatePicker txtApprovalDate; /// - /// txtImplementationFrontState 控件。 + /// drpImplementationFrontState 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtImplementationFrontState; + protected global::FineUIPro.DropDownList drpImplementationFrontState; /// /// txtCompleteDate 控件。 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs index 5bae9b6e..b8506108 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs @@ -684,8 +684,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew checkStatisc.TotalCheckNum = totalManagementList.Count(); checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null); - checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString(); //当期完成数 - checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString(); //累计完成数 + checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //当期完成数 + checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //累计完成数 StatisticsList.Add(checkStatisc); Quantity1Sum += checkStatisc.CheckNum; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 7f406d21..438065e8 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -830,8 +830,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew checkStatisc.TotalCheckNum = totalManagementList.Count(); checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null); - checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString(); //当期完成数 - checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString(); //累计完成数 + checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //当期完成数 + checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //累计完成数 StatisticsList.Add(checkStatisc); Quantity1Sum += checkStatisc.CheckNum; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设计变更单导入模板.xls index c51fd734984d906bdf84733ee45f8d4c440dba38..7859e742c8ea850ec7b502a898905d8a2e229ba2 100644 GIT binary patch literal 19456 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 aVc7S(g1ifHfGd81j-fk6!Senc-Twe-HPdPU literal 20480 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 diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc index 56814ef9e21e96274c01dd07adeff8ddc2daf690..d896d1885399b6be67cb5dd6f90ca6f36ca034a6 100644 GIT binary patch delta 32493 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 EfBEdlYybcN delta 31672 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 A00000 From 6ba17f2d027f80472225d7b15cbeb345a524fe39 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 18 Apr 2024 15:04:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataShow/InspectionManagement.aspx | 126 ++++++++++ .../DataShow/InspectionManagement.aspx.cs | 234 ++++++++++++++++++ .../InspectionManagement.aspx.designer.cs | 195 +++++++++++++++ .../DataShow/InspectionManagementItem.aspx | 108 ++++++++ .../DataShow/InspectionManagementItem.aspx.cs | 219 ++++++++++++++++ .../InspectionManagementItem.aspx.designer.cs | 159 ++++++++++++ SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx | 121 +++++++++ SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs | 234 ++++++++++++++++++ .../DataShow/WeldOneOK.aspx.designer.cs | 186 ++++++++++++++ SGGL/FineUIPro.Web/ErrLog.txt | 215 ++++++++++++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 24 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/FineUIPro.Web/common/main_new.aspx | 15 +- SGGL/FineUIPro.Web/common/main_new.aspx.cs | 44 ++-- SGGL/FineUIPro.Web/common/main_new1.aspx | 4 +- SGGL/FineUIPro.Web/common/main_new1.aspx.cs | 49 ++-- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 18 files changed, 1882 insertions(+), 57 deletions(-) create mode 100644 SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx new file mode 100644 index 00000000..e021230d --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx @@ -0,0 +1,126 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionManagement.aspx.cs" Inherits="FineUIPro.Web.DataShow.InspectionManagement" %> + + + + + + + + + 质量共检数据 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs new file mode 100644 index 00000000..94223888 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs @@ -0,0 +1,234 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.DataShow +{ + public partial class InspectionManagement : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + // 绑定表格t + BindGrid(); + this.Panel1.Title = "质量共检数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 "; + List listStr = new List(); + string cpara = string.Empty; + if (this.drpProject.SelectedValue != Const._Null) + { + strSql += " AND projectId = @projectId"; ///状态为已完成 + listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue)); + } + + //if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + //{ + // strSql += " AND h.RegisterDate >=@StartTime"; + // listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text)); + + // cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text; + //} + //if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + //{ + // strSql += " AND h.RegisterDate <=@EndTime"; + // listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text)); + + // cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text; + //} + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid双击事件 编辑 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + EditData(); + } + + + /// + /// + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionManagementItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - "))); + } + #endregion + + + protected void btnView_Click(object sender, EventArgs e) + { + EditData(); + } + + /// + /// 数量 + /// + /// + /// + protected int Count1(object projectId) + { + int cout1 = 0; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); + if (datetime1.HasValue) + { + getT = getT.Where(x => x.InspectionDate >= datetime1); + } + if (datetime2.HasValue) + { + getT = getT.Where(x => x.InspectionDate <= datetime2); + } + + cout1 = getT.Count(); + } + return cout1; + } + + protected int Count2(object projectId) + { + int cout1 = 0; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); + if (datetime1.HasValue) + { + getT = getT.Where(x => x.InspectionDate >= datetime1); + } + if (datetime2.HasValue) + { + getT = getT.Where(x => x.InspectionDate <= datetime2); + } + + cout1 = getT.Count(); + } + return cout1; + } + + protected string Count4(object projectId) + { + string rate = string.Empty; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); + + if (datetime1.HasValue) + { + getALL = getALL.Where(x => x.CheckDate >= datetime1); + } + if (datetime2.HasValue) + { + getALL = getALL.Where(x => x.CheckDate >= datetime1); + } + var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); + int coutall = getALL.Count(); + int cout0 = getT.Count(); + if (coutall > 0) + { + rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString(); + } + } + return rate; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs new file mode 100644 index 00000000..d8bd60a2 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs @@ -0,0 +1,195 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow { + + + public partial class InspectionManagement { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnView; + } +} diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx new file mode 100644 index 00000000..34b3a5d4 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx @@ -0,0 +1,108 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionManagementItem.aspx.cs" Inherits="FineUIPro.Web.DataShow.InspectionManagementItem" %> + + + + + + + + + 质量共检详细 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs new file mode 100644 index 00000000..e0ea345e --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs @@ -0,0 +1,219 @@ +using Aspose.Words; +using BLL; +using Org.BouncyCastle.Asn1.Ocsp; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DataShow +{ + public partial class InspectionManagementItem : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string projectId = Request.Params["projectId"]; + this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId); + Funs.DropDownPageSize(this.ddlPageSize); + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格t + BindGrid(); + this.Panel1.Title = "质量共检数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT distinct P.InspectionId, + P.ProjectId, + P.UnitId, + P.CNProfessionalId, + P.UnitWorkId, + U.UnitName, + C.ProfessionalName, + P.NoticeCode, + UnitWork.UnitWorkName, + DP.DivisionName AS Branch, + BP.BreakdownName AS ControlPointType, + BP.Class, + P.AcceptanceSite, + P.AcceptanceCheckMan, + (CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified, + P.InspectionCode, + P.InspectionDate" + + @" FROM ProcessControl_InspectionManagementDetail AS D" + + @" LEFT JOIN ProcessControl_InspectionManagement AS P on P.InspectionId=D.InspectionId" + + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId" + + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId" + + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId" + + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch" + + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType" + + @" WHERE P.ProjectId=@ProjectId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); + + strSql += " AND (P.InspectionDate>=@startTime or @startTime='') and (P.InspectionDate<=@endTime or @endTime='') "; + listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "")); + listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "")); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + protected string ConvertImageUrlByImage(object registrationId) + { + string url = string.Empty; + string httpUrl = string.Empty; + var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + if (sysSet6 != null) + { + httpUrl = sysSet6.SetValue; + } + if (registrationId != null) + { + IList sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId); + + if (sourlist != null && sourlist.Count > 0) + { + string AttachUrl = ""; + foreach (var item in sourlist) + { + if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) + AttachUrl += item.AttachUrl.TrimEnd(',') + ","; + } + url = BLL.UploadAttachmentService.ShowImage("../", AttachUrl.TrimEnd(',')); + } + } + return url; + } + protected string ConvertImgUrlByImage(object registrationId) + { + string url = string.Empty; + string httpUrl = string.Empty; + var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + if (sysSet6 != null) + { + httpUrl = sysSet6.SetValue; + } + if (registrationId != null) + { + IList sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId); + + if (sourlist != null && sourlist.Count > 0) + { + string AttachUrl = ""; + foreach (var item in sourlist) + { + if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) + AttachUrl += item.AttachUrl.TrimEnd(',') + ","; + } + url = BLL.UploadAttachmentService.ShowImage("../", AttachUrl.TrimEnd(',')); + } + } + return url; + } + + public string Convertstatus(Object code) + { + Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString()); + if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) + { + return "未确认"; + } + else if (checkControl.State == Const.CheckControl_Complete) + { //闭环 + return "已闭环"; + } + //else if( checkControl.LimitDate> ) + else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 + { + return "超期未整改"; + + } + else //期内未整改 + { + return "未整改"; + + } + } + + /// + /// 获取检查人名称 + /// + /// + /// + protected string ConvertCheckMan(object CarryUnitIds) + { + var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds); + if (string.IsNullOrEmpty(uname)) + { + uname = CarryUnitIds.ToString(); + } + return uname; + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs new file mode 100644 index 00000000..9a2c6254 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.designer.cs @@ -0,0 +1,159 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow { + + + public partial class InspectionManagementItem { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// lbtnFileUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx new file mode 100644 index 00000000..e6a14ddb --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx @@ -0,0 +1,121 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldOneOK.aspx.cs" Inherits="FineUIPro.Web.DataShow.WeldOneOK" %> + + + + + + + + + 焊接一次合格率 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs new file mode 100644 index 00000000..7ef549cd --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs @@ -0,0 +1,234 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.DataShow +{ + public partial class WeldOneOK : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + // 绑定表格t + BindGrid(); + this.Panel1.Title = "质量共检数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 "; + List listStr = new List(); + string cpara = string.Empty; + if (this.drpProject.SelectedValue != Const._Null) + { + strSql += " AND projectId = @projectId"; ///状态为已完成 + listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue)); + } + + //if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + //{ + // strSql += " AND h.RegisterDate >=@StartTime"; + // listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text)); + + // cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text; + //} + //if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + //{ + // strSql += " AND h.RegisterDate <=@EndTime"; + // listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text)); + + // cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text; + //} + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid双击事件 编辑 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + EditData(); + } + + + /// + /// + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionManagementItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - "))); + } + #endregion + + + protected void btnView_Click(object sender, EventArgs e) + { + EditData(); + } + + /// + /// 数量 + /// + /// + /// + protected int Count1(object projectId) + { + int cout1 = 0; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); + if (datetime1.HasValue) + { + getT = getT.Where(x => x.InspectionDate >= datetime1); + } + if (datetime2.HasValue) + { + getT = getT.Where(x => x.InspectionDate <= datetime2); + } + + cout1 = getT.Count(); + } + return cout1; + } + + protected int Count2(object projectId) + { + int cout1 = 0; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); + if (datetime1.HasValue) + { + getT = getT.Where(x => x.InspectionDate >= datetime1); + } + if (datetime2.HasValue) + { + getT = getT.Where(x => x.InspectionDate <= datetime2); + } + + cout1 = getT.Count(); + } + return cout1; + } + + protected string Count4(object projectId) + { + string rate = string.Empty; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); + + if (datetime1.HasValue) + { + getALL = getALL.Where(x => x.CheckDate >= datetime1); + } + if (datetime2.HasValue) + { + getALL = getALL.Where(x => x.CheckDate >= datetime1); + } + var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); + int coutall = getALL.Count(); + int cout0 = getT.Count(); + if (coutall > 0) + { + rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString(); + } + } + return rate; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs new file mode 100644 index 00000000..fbaf87a8 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs @@ -0,0 +1,186 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow { + + + public partial class WeldOneOK { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnView; + } +} diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..56e6d7c8 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,215 @@ + +错误信息开始=====> +错误类型:SqlException +错误信息:无法绑定由多个部分组成的标识符 "chec.InspectionDate"。 +无法绑定由多个部分组成的标识符 "chec.InspectionDate"。 +错误堆栈: + 在 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.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.DataShow.InspectionManagementItem.BindGrid() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\DataShow\InspectionManagementItem.aspx.cs:行号 74 + 在 FineUIPro.Web.DataShow.InspectionManagementItem.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\DataShow\InspectionManagementItem.aspx.cs:行号 32 + 在 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/17/2024 17:23:37 +出错文件:http://localhost:8579/DataShow/InspectionManagementItem.aspx?projectId=32d0bca0-7693-4bd6-813d-6ee174ba29d3 +IP地址:::1 +操作人员:JT + +出错时间:04/17/2024 17:23:37 + + +错误信息开始=====> +错误类型:ArgumentNullException +错误信息:值不能为 null。 +参数名: source +错误堆栈: + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInvocation(InvocationExpression invoke) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitContains(Expression sequence, Expression value) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitExpression(Expression exp) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitWhere(Expression sequence, LambdaExpression predicate) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitAggregate(Expression sequence, LambdaExpression lambda, SqlNodeType aggType, Type returnType) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node) + 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) + 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) + 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) + 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) + 在 FineUIPro.Web.common.main_new.getZlgj() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 544 + 在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 91 + 在 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/18/2024 11:19:17 +出错文件:http://localhost:8579/common/main_new.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/18/2024 11:19:17 + + +错误信息开始=====> +错误类型: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/18/2024 12:51:29 +出错时间:04/18/2024 12:51:29 + + +错误信息开始=====> +错误类型: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/18/2024 12:51:29 +出错时间:04/18/2024 12:51:29 + + +错误信息开始=====> +错误类型: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/18/2024 12:51:29 +出错时间:04/18/2024 12:51:29 + + +错误信息开始=====> +错误类型: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/18/2024 12:51:29 +出错时间:04/18/2024 12:51:29 + + +错误信息开始=====> +错误类型:ArgumentNullException +错误信息:值不能为 null。 +参数名: source +错误堆栈: + 在 System.Linq.Enumerable.OfType[TResult](IEnumerable source) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitContains(Expression sequence, Expression value) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitExpression(Expression exp) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitWhere(Expression sequence, LambdaExpression predicate) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitAggregate(Expression sequence, LambdaExpression lambda, SqlNodeType aggType, Type returnType) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) + 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) + 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node) + 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) + 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) + 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) + 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) + 在 FineUIPro.Web.common.main_new.getZlgj() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 546 + 在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 92 + 在 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/18/2024 14:10:41 +出错文件:http://localhost:8579/common/main_new.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/18/2024 14:10:41 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index dba04c82..fb77e794 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -602,6 +602,8 @@ + + @@ -622,6 +624,7 @@ + @@ -8583,6 +8586,20 @@ HJGLWeldingItem.aspx + + InspectionManagement.aspx + ASPXCodeBehind + + + InspectionManagement.aspx + + + InspectionManagementItem.aspx + ASPXCodeBehind + + + InspectionManagementItem.aspx + LargeEngineering.aspx ASPXCodeBehind @@ -8723,6 +8740,13 @@ SecurityRiskItem.aspx + + WeldOneOK.aspx + ASPXCodeBehind + + + WeldOneOK.aspx + WorkingHours.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..f50b26d3 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx index fef77127..3f9a9080 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx +++ b/SGGL/FineUIPro.Web/common/main_new.aspx @@ -100,10 +100,10 @@
质量培训累计人员
0
-
-
-
-
+
+
+
+
@@ -403,7 +403,12 @@ // $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量问题数据 window.open("../DataShow/QualityProblem.aspx") - } else if (type == 'ManagerData') { + }else if (type == 'InspectionManagement') { + // $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量共检数据 + window.open("../DataShow/InspectionManagement.aspx") + + } + else if (type == 'ManagerData') { // $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据 window.open("../DataShow/QualityPerson.aspx") diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs index b409036d..998e7b47 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs @@ -84,18 +84,6 @@ namespace FineUIPro.Web.common select x).Count(); divCqmsPxNum.InnerText = CqmsPxNum.ToString(); - //质量问题 - getZlwt(); - - //质量共检 - getZlgj(); - - //焊接 - getHj(); - - //关键事项 - getGjsx(); - //在建项目 allProjects = ProjectService.GetAllProjectDropDownList(); int acount = allProjects.Count(); @@ -112,6 +100,18 @@ namespace FineUIPro.Web.common div_cjrsCount.InnerText = pcount2.ToString(); div_wdgcCount.InnerText = pcount3.ToString(); + //质量问题 + getZlwt(); + + //质量共检 + getZlgj(); + + //焊接 + getHj(); + + //关键事项 + getGjsx(); + //人员信息 getSitePerson(); @@ -571,28 +571,14 @@ namespace FineUIPro.Web.common List listdata = new List(); double result = 0; Model.SGGLDB db = Funs.DB; - var ndtLists = from x in db.HJGL_FL_NdtList select x; - ////一次检测合格焊口数 - //int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem - // join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId - // join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId - // join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID - // where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null - // select x.NDEItemID).Count(); - ////一次检测返修焊口数 - //int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem - // join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId - // join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId - // join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID - // where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2" - // select x.NDEItemID).Count(); + var ndtLists = from x in db.ProcessControl_NondestructiveTest_New select x; if (ndtLists.Count() > 0) { decimal a = 0, b = 0; foreach (var item in ndtLists) { - a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount); - b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount); + //a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount); + //b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount); } if (b > 0) { diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx b/SGGL/FineUIPro.Web/common/main_new1.aspx index 50c43a92..a648fd34 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx @@ -142,11 +142,11 @@
<%=getAllInspectionManagement() %>
-
-次合格数量
+
一次合格数量
<%=getIsOnceInspectionManagement() %>
-
-次验收合格率
+
一次验收合格率
<%=GetInspectionManagementZgl() %>
diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs index 5c820a79..a96d77d1 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs @@ -57,7 +57,8 @@ namespace FineUIPro.Web.common unitId = thisUnit.UnitId; } int result = (from x in Funs.DB.Person_CompanyBranchPerson - where x.IsOnJob == true && x.UnitId == unitId + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.IsOnJob == true && x.UnitId == unitId && y.IsCQMS == true select x).Count(); return result; } @@ -74,7 +75,8 @@ namespace FineUIPro.Web.common unitId = thisUnit.UnitId; } int result = (from x in Funs.DB.Person_CompanyBranchPerson - where x.IsOnJob == true && x.UnitId != unitId + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.IsOnJob == true && x.UnitId != unitId && y.IsCQMS == true select x).Count(); return result; } @@ -182,10 +184,12 @@ namespace FineUIPro.Web.common int result = 0; ; //统计所给时间段的全部数量 - List managementListSunNumber = - BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate( - null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false); - result = managementListSunNumber.Count; + //List managementListSunNumber = + // BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate( + // null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false); + var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement + select x).Count(); + result = num1; //int result = (from x in Funs.DB.Check_CheckControl // where x.CheckDate <= DateTime.Now && x.State == "7" // select x).Count(); @@ -199,10 +203,13 @@ namespace FineUIPro.Web.common { int result = 0; //统计所给时间段的合格数量 - List managementListOneNumber = - BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate( - null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true); - result = managementListOneNumber.Count; + //List managementListOneNumber = + // BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate( + // null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true); + var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement + where x.IsOnceQualified == true + select x).Count(); + result = num2; //int result = (from x in Funs.DB.Check_CheckControl // where x.CheckDate <= DateTime.Now && x.State != "7" @@ -422,17 +429,23 @@ namespace FineUIPro.Web.common //获取专业 InspectionManagementZy += "'" + item.ProfessionalName + "',"; //根据专业获取总计 - var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail - join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId - where y.CNProfessionalId == item.CNProfessionalId - select x).ToList().Count; + //var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + // join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId + // where y.CNProfessionalId == item.CNProfessionalId + // select x).ToList().Count; + var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement + where x.CNProfessionalId == item.CNProfessionalId + select x).Count(); InspectionManagementSumCount += "'"+ num1 + "',"; //根据专业获取合格数 - var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail - join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId - where y.CNProfessionalId == item.CNProfessionalId && y.IsOnceQualified==true - select x).ToList().Count; + //var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + // join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId + // where y.CNProfessionalId == item.CNProfessionalId && y.IsOnceQualified==true + // select x).ToList().Count; + var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement + where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true + select x).Count(); InspectionManagementOkCount += "'" + num2 + "',"; //一次验收合格率 diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From 016ea897dc73a636c939d2d1a4dc4eb4ec2f4899 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 19 Apr 2024 10:13:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?20240419=20NCR=E9=99=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-04-18-bwj.sql | 3 + SGGL/BLL/CQMS/Check/JointCheckService.cs | 10 + .../Comprehensive/SpecialEquipmentService.cs | 2 + SGGL/BLL/Common/Const.cs | 5 + SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx | 3 + .../CQMS/Check/JointCheck.aspx.cs | 184 ++ .../CQMS/Check/JointCheck.aspx.designer.cs | 9 + .../CQMS/Comprehensive/NCRManagementEdit.aspx | 2 +- .../Comprehensive/NCRManagementEdit.aspx.cs | 24 +- .../CQMS/Comprehensive/SpecialEquipment.aspx | 3 + .../Comprehensive/SpecialEquipment.aspx.cs | 2 +- .../Comprehensive/SpecialEquipmentEdit.aspx | 1 + .../SpecialEquipmentEdit.aspx.cs | 4 + .../SpecialEquipmentEdit.aspx.designer.cs | 65 +- .../File/Excel/CQMS/质量专项检查模版.xlsx | Bin 0 -> 10196 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/Model/Model.cs | 1811 ++++++++++------- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 18 files changed, 1352 insertions(+), 780 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql new file mode 100644 index 00000000..778001ef --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-18-bwj.sql @@ -0,0 +1,3 @@ + +alter table Comprehensive_SpecialEquipment add PositionNum nvarchar(50) +go \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Check/JointCheckService.cs b/SGGL/BLL/CQMS/Check/JointCheckService.cs index 7e6a43ec..bdd02f6d 100644 --- a/SGGL/BLL/CQMS/Check/JointCheckService.cs +++ b/SGGL/BLL/CQMS/Check/JointCheckService.cs @@ -518,5 +518,15 @@ namespace BLL db.SubmitChanges(); } } + + /// + /// 根据项目Id获取专项检查 + /// + /// + /// + public static List GetDriverPlanByProjectId(string projectId) + { + return (from x in Funs.DB.Check_JointCheck where x.ProjectId == projectId select x).ToList(); + } } } diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs index 6d0f4537..a3f7f589 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs @@ -105,6 +105,7 @@ namespace BLL newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber; newEquipment.CompileMan = SpecialEquipment.CompileMan; newEquipment.Status = SpecialEquipment.Status; + newEquipment.PositionNum = SpecialEquipment.PositionNum; db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment); db.SubmitChanges(); } @@ -127,6 +128,7 @@ namespace BLL newEquipment.SubmitDataNumber = SpecialEquipment.SubmitDataNumber; newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber; newEquipment.Status = SpecialEquipment.Status; + newEquipment.PositionNum = SpecialEquipment.PositionNum; db.SubmitChanges(); } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index ff6456f1..841ddca2 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3250,6 +3250,11 @@ namespace BLL /// 培训记录导入模板原始虚拟路径 ///
public const string CQMS_TrainingRecordsTemplateUrl= "File\\Excel\\DataIn\\培训记录导入模板.xlsx"; + + /// + /// 质量专项检查模板文件原始虚拟路径 + /// + public const string JointCheckTempUrl = "File\\Excel\\CQMS\\质量专项检查模版.xlsx"; #endregion #region 绩效考核模板文件路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx index 765c8c30..7a597f11 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx @@ -75,6 +75,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs index 6e3bb4a7..34e2e611 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; @@ -401,5 +402,188 @@ namespace FineUIPro.Web.CQMS.Check txtEndTime.Text = ""; bindata(); } + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.JointCheckTempUrl; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + var lists = BLL.JointCheckService.GetDriverPlanByProjectId(this.CurrUser.LoginProjectId); + if (lists != null) + { + newUrl = uploadfilepath.Replace("质量专项检查模版.xlsx", "质量专项检查.xlsx"); + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + NPOI.SS.UserModel.ICellStyle cellStyle0 = workbook.CreateCellStyle(); + cellStyle0.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle0.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle0.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + var font0 = workbook.CreateFont(); + font0.FontHeightInPoints = 12; + font0.IsBold = true; + cellStyle0.SetFont(font0); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 1; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + cell.SetCellValue(i.ToString());//序号 + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.JointCheckCode); + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(BLL.UnitService.GetUnitNameByUnitId(item.UnitId)); + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + string checkName = string.Empty; + if (item.CheckType == "1") + { + checkName = "周检查"; + } + else if (item.CheckType == "2") + { + checkName = "月检查"; + } + else if (item.CheckType == "3") + { + checkName = "不定期检查"; + } + else if (item.CheckType == "4") + { + checkName = "专业检查"; + } + cell.SetCellValue(checkName); + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CheckName); + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : ""); + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(BLL.UserService.GetUserNameByUserId(item.CheckMan)); + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + string state = string.Empty; + if (item.State.ToString() == BLL.Const.JointCheck_ReCompile) + { + state = "重新编制"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Compile) + { + state = "编制"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit1) + { + state = "分包专工回复"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit2) + { + state = "分包负责人审批"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit3) + { + state = "总包专工回复"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit4) + { + state = "总包负责人审批"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Complete) + { + state = "审批完成"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Z) + { + state = "整改中"; + } + else if (item.State.ToString() == BLL.Const.JointCheck_Audit1R) + { + state = "分包专工重新回复"; + } + cell.SetCellValue(state); + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + string userNames = string.Empty; + List list = BLL.JointCheckApproveService.GetJointCheckApprovesByJointCheckId(item.JointCheckId); + foreach (var a in list) + { + if (a != null) + { + if (a.ApproveMan != null) + { + if (!userNames.Contains(BLL.UserService.GetUserByUserId(a.ApproveMan).UserName)) + { + userNames += UserService.GetUserByUserId(a.ApproveMan).UserName + ","; + } + } + } + } + if (!string.IsNullOrEmpty(userNames)) + { + userNames = userNames.Substring(0, userNames.LastIndexOf(",")); + } + cell.SetCellValue(userNames); + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs index 5ca52c9c..8f7cbdb0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.designer.cs @@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Check { /// protected global::FineUIPro.Button btnNew; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index 653c6db2..b0d36bb2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -88,7 +88,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 0b4321f5..3ffaff70 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -275,12 +275,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); this.hdAttachUrl.Text = nCRManagement.NCRManagementId; } - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); - return; - } + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} nCRManagement.CompileMan = this.CurrUser.UserId; nCRManagement.Status = BLL.Const.Comprehensive_Compile; BLL.NCRManagementService.AddNCRManagement(nCRManagement); @@ -288,12 +288,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive else { nCRManagement.NCRManagementId = this.NCRManagementId; - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); - if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - { - Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); - return; - } + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); + //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + //{ + // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // return; + //} var model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault(); if (model != null) { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx index a08d66b8..5c5f0f85 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx @@ -48,6 +48,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs index 81356dcf..03e0f526 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs @@ -32,7 +32,7 @@ namespace FineUIPro.Web.Comprehensive public void BindGrid() { string strSql = @"select C.SpecialEquipmentId, ProjectId,C.EquipmentId, SunNumber, Status, - InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName + InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName,PositionNum from Comprehensive_SpecialEquipment C left join Base_Unit U on C.UnitId=U.UnitId left join Base_SpecialEquipment eq on eq.SpecialEquipmentId = C.EquipmentId diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx index 115203ae..318daf38 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx @@ -33,6 +33,7 @@ + //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class SpecialEquipmentEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class SpecialEquipmentEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpUnit 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpEquipmentId 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpEquipmentId; - + /// /// txtSunNumber 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSunNumber; - + /// /// txtInformNumber 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtInformNumber; - + /// /// txtSubmitDataNumber 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSubmitDataNumber; - + /// /// txtMonitoringReportNumber 控件。 /// @@ -94,7 +92,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtMonitoringReportNumber; - + + /// + /// txtPositionNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPositionNum; + /// /// Panel2 控件。 /// @@ -103,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -112,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// txtReportTime 控件。 /// @@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReportTime; - + /// /// agree 控件。 /// @@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx b/SGGL/FineUIPro.Web/File/Excel/CQMS/质量专项检查模版.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..37d2fbc1caa1a9b263a7ff9cb33b4b4ff0a6c45a GIT binary patch literal 10196 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 bQhwEc6{KMvvlwuYK!^AM)|u|b!^q3 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0f1863ef..c3200bad 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1457,6 +1457,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2015,6 +2018,9 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); + partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -6493,6 +6499,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligations + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -7981,6 +7995,14 @@ namespace Model } } + public System.Data.Linq.Table Report_CQMS_ProblemHandle + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Report_CqmsTarget { get @@ -21530,8 +21552,6 @@ namespace Model private string _CodeRule; - private EntitySet _Doc_DocManage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21548,7 +21568,6 @@ namespace Model public Base_DocType() { - this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21632,19 +21651,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManage - { - get - { - return this._Doc_DocManage; - } - set - { - this._Doc_DocManage.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -21664,18 +21670,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = this; - } - - private void detach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -97436,10 +97430,10 @@ namespace Model private string _AuditMan; - private string _Problem; - private string _Measure; + private string _Problem; + private EntityRef _Sys_User; private EntityRef _Base_CNProfessional; @@ -97486,10 +97480,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnProblemChanging(string value); - partial void OnProblemChanged(); partial void OnMeasureChanging(string value); partial void OnMeasureChanged(); + partial void OnProblemChanging(string value); + partial void OnProblemChanged(); #endregion public Comprehensive_NCRManagement() @@ -97857,27 +97851,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")] - public string Problem - { - get - { - return this._Problem; - } - set - { - if ((this._Problem != value)) - { - this.OnProblemChanging(value); - this.SendPropertyChanging(); - this._Problem = value; - this.SendPropertyChanged("Problem"); - this.OnProblemChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] public string Measure { get @@ -97897,6 +97871,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + public string Problem + { + get + { + return this._Problem; + } + set + { + if ((this._Problem != value)) + { + this.OnProblemChanging(value); + this.SendPropertyChanging(); + this._Problem = value; + this.SendPropertyChanged("Problem"); + this.OnProblemChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -101143,6 +101137,8 @@ namespace Model private System.Nullable _ReportTime; + private string _PositionNum; + private EntityRef _Sys_User; private EntityRef _Base_Project; @@ -101177,6 +101173,8 @@ namespace Model partial void OnAuditManChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); + partial void OnPositionNumChanging(string value); + partial void OnPositionNumChanged(); #endregion public Comprehensive_SpecialEquipment() @@ -101439,6 +101437,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PositionNum", DbType="NVarChar(50)")] + public string PositionNum + { + get + { + return this._PositionNum; + } + set + { + if ((this._PositionNum != value)) + { + this.OnPositionNumChanging(value); + this.SendPropertyChanging(); + this._PositionNum = value; + this.SendPropertyChanged("PositionNum"); + this.OnPositionNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_SpecialEquipment_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -120067,8 +120085,6 @@ namespace Model private EntityRef _Base_CNProfessional; - private EntityRef _Base_DocType; - private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -120120,7 +120136,6 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); - this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -120199,10 +120214,6 @@ namespace Model { if ((this._DocTypeId != value)) { - if (this._Base_DocType.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -120522,40 +120533,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] - public Base_DocType Base_DocType - { - get - { - return this._Base_DocType.Entity; - } - set - { - Base_DocType previousValue = this._Base_DocType.Entity; - if (((previousValue != value) - || (this._Base_DocType.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_DocType.Entity = null; - previousValue.Doc_DocManage.Remove(this); - } - this._Base_DocType.Entity = value; - if ((value != null)) - { - value.Doc_DocManage.Add(this); - this._DocTypeId = value.DocTypeId; - } - else - { - this._DocTypeId = default(string); - } - this.SendPropertyChanged("Base_DocType"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -120726,8 +120703,6 @@ namespace Model private EntityRef _Doc_DocManage; - private EntityRef _Sys_User; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -120751,7 +120726,6 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -120799,7 +120773,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] public string ApproveMan { get @@ -120810,10 +120784,6 @@ namespace Model { if ((this._ApproveMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -120937,40 +120907,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)] - public Sys_User Sys_User - { - get - { - return this._Sys_User.Entity; - } - set - { - Sys_User previousValue = this._Sys_User.Entity; - if (((previousValue != value) - || (this._Sys_User.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Sys_User.Entity = null; - previousValue.Doc_DocManageApprove.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.Doc_DocManageApprove.Add(this); - this._ApproveMan = value.UserId; - } - else - { - this._ApproveMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -234734,6 +234670,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] + public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligations() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligations.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligations.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -240933,6 +241092,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligations; + private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -241205,6 +241366,7 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -243385,6 +243547,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligations + { + get + { + return this._Manager_Month_ComplianceObligations; + } + set + { + this._Manager_Month_ComplianceObligations.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -243966,6 +244141,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -272310,7 +272497,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -272324,18 +272511,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + + private string _SubInspectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -272352,8 +272541,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -272366,18 +272555,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -272505,22 +272696,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId { get { - return this._SubInspectId; + return this._QuestionTechnologyId; } set { - if ((this._SubInspectId != value)) + if ((this._QuestionTechnologyId != value)) { - this.OnSubInspectIdChanging(value); + this.OnQuestionTechnologyIdChanging(value); this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); } } } @@ -272645,26 +272836,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -272685,26 +272856,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -272765,6 +272916,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -272806,14 +273017,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -272832,14 +273043,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -272987,26 +273198,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -273067,6 +273258,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -273999,7 +274210,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -274122,6 +274333,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -274130,6 +274347,12 @@ namespace Model private string _Owner; + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -274140,9 +274363,7 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; + private System.Nullable _WanderIsComplete; private System.Nullable _SubcontractorAllPassData; @@ -274152,35 +274373,25 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderIsComplete; - private System.Nullable _WanderCompleteData; + private System.Nullable _WorkPackType; + private System.Nullable _IsSiteImplement; - private string _SiteImplementUser; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - private System.Nullable _InspectIsClose; - private string _InspectIsCloseUser; - private System.Nullable _InspectCloseData; - private System.Nullable _IsUnifyWanderAbout; + private string _InspectIsCloseUser; - private System.Nullable _UnifyWanderAboutData; + private string _PropertyTechnologyId; - private string _UnifyWanderAboutOpinion; + private System.Nullable _RecordUploadData; - private System.Nullable _InspectTime; + private System.Nullable _SiteImplementConfirmData; - private string _AddUser; - - private System.Nullable _AddTime; + private string _SiteImplementUser; #region 可扩展性方法定义 partial void OnLoaded(); @@ -274202,6 +274413,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -274210,6 +274427,12 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -274220,10 +274443,8 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -274232,36 +274453,26 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); partial void OnInspectCloseDataChanging(System.Nullable value); partial void OnInspectCloseDataChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); #endregion public PreRun_SubInspectTerm() @@ -274429,6 +274640,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -274509,6 +274780,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -274609,42 +274940,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete { get { - return this._WorkPackType; + return this._WanderIsComplete; } set { - if ((this._WorkPackType != value)) + if ((this._WanderIsComplete != value)) { - this.OnWorkPackTypeChanging(value); + this.OnWanderIsCompleteChanging(value); this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); } } } @@ -274729,26 +275040,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete - { - get - { - return this._WanderIsComplete; - } - set - { - if ((this._WanderIsComplete != value)) - { - this.OnWanderIsCompleteChanging(value); - this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -274769,6 +275060,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -274789,66 +275100,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] public System.Nullable InspectIsClose { @@ -274869,26 +275120,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] public System.Nullable InspectCloseData { @@ -274909,122 +275140,102 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] + public string InspectIsCloseUser { get { - return this._IsUnifyWanderAbout; + return this._InspectIsCloseUser; } set { - if ((this._IsUnifyWanderAbout != value)) + if ((this._InspectIsCloseUser != value)) { - this.OnIsUnifyWanderAboutChanging(value); + this.OnInspectIsCloseUserChanging(value); this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] + public string PropertyTechnologyId { get { - return this._UnifyWanderAboutData; + return this._PropertyTechnologyId; } set { - if ((this._UnifyWanderAboutData != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnUnifyWanderAboutDataChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._UnifyWanderAboutOpinion; + return this._RecordUploadData; } set { - if ((this._UnifyWanderAboutOpinion != value)) + if ((this._RecordUploadData != value)) { - this.OnUnifyWanderAboutOpinionChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData { get { - return this._InspectTime; + return this._SiteImplementConfirmData; } set { - if ((this._InspectTime != value)) + if ((this._SiteImplementConfirmData != value)) { - this.OnInspectTimeChanging(value); + this.OnSiteImplementConfirmDataChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] + public string SiteImplementUser { get { - return this._AddUser; + return this._SiteImplementUser; } set { - if ((this._AddUser != value)) + if ((this._SiteImplementUser != value)) { - this.OnAddUserChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -275092,22 +275303,6 @@ namespace Model private string _Owner; - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -275120,6 +275315,22 @@ namespace Model private System.Nullable _Sort; + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275160,22 +275371,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -275188,6 +275383,22 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -275555,166 +275766,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -275735,7 +275786,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] public string PropertyTechnologyId { get @@ -275835,6 +275886,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -276836,8 +277047,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -276848,11 +277057,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -276868,6 +277075,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -276904,8 +277115,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -276916,12 +277125,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -276936,6 +277143,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -277245,26 +277456,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -277365,26 +277556,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -277405,22 +277576,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -277565,6 +277736,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -278277,7 +278488,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -313162,6 +313373,164 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] + public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ReportId; + + private string _ReType; + + private string _UnitName; + + private string _ProblemDes; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnReportIdChanging(string value); + partial void OnReportIdChanged(); + partial void OnReTypeChanging(string value); + partial void OnReTypeChanged(); + partial void OnUnitNameChanging(string value); + partial void OnUnitNameChanged(); + partial void OnProblemDesChanging(string value); + partial void OnProblemDesChanged(); + #endregion + + public Report_CQMS_ProblemHandle() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")] + public string ReportId + { + get + { + return this._ReportId; + } + set + { + if ((this._ReportId != value)) + { + this.OnReportIdChanging(value); + this.SendPropertyChanging(); + this._ReportId = value; + this.SendPropertyChanged("ReportId"); + this.OnReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")] + public string ReType + { + get + { + return this._ReType; + } + set + { + if ((this._ReType != value)) + { + this.OnReTypeChanging(value); + this.SendPropertyChanging(); + this._ReType = value; + this.SendPropertyChanged("ReType"); + this.OnReTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this.OnUnitNameChanging(value); + this.SendPropertyChanging(); + this._UnitName = value; + this.SendPropertyChanged("UnitName"); + this.OnUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] + public string ProblemDes + { + get + { + return this._ProblemDes; + } + set + { + if ((this._ProblemDes != value)) + { + this.OnProblemDesChanging(value); + this.SendPropertyChanging(); + this._ProblemDes = value; + this.SendPropertyChanged("ProblemDes"); + this.OnProblemDesChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged { @@ -349459,8 +349828,6 @@ namespace Model private EntitySet _Doc_DocManage; - private EntitySet _Doc_DocManageApprove; - private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -350175,7 +350542,6 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); - this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -352567,19 +352933,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManageApprove - { - get - { - return this._Doc_DocManageApprove; - } - set - { - this._Doc_DocManageApprove.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -357072,18 +357425,6 @@ namespace Model entity.Sys_User = null; } - private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging(); diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From 44580d9acbef1e2d00107fe5913f09523b7ef475 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 19 Apr 2024 15:34:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?20240419=20NCR=E3=80=81=E5=9B=BE=E7=BA=B8?= =?UTF-8?q?=E6=94=B6=E5=8F=91=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/ProjectData/UnitWorkService.cs | 19 ++ SGGL/BLL/SysManage/UnitService.cs | 6 +- .../DesignDrawingsDataIn.aspx.cs | 167 ++++++++------ .../Comprehensive/NCRManagementDataIn.aspx.cs | 100 +++++--- .../CQMS/Comprehensive/NCRManagementEdit.aspx | 2 +- SGGL/FineUIPro.Web/ErrLog.txt | 215 ------------------ .../File/Excel/DataIn/NCR管理导入模板.xls | Bin 19968 -> 20480 bytes .../Excel/DataIn/图纸收发记录导入模板.xls | Bin 19456 -> 19968 bytes SGGL/FineUIPro.Web/Web.config | 2 +- 9 files changed, 191 insertions(+), 320 deletions(-) diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index e3ef0752..16e48681 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -590,5 +590,24 @@ namespace BLL } return name; } + + public static string GetUnitWorkIdsByUnitWorkNames(string projectId,string unitWorks) + { + if (!string.IsNullOrEmpty(unitWorks)) + { + string[] ins = unitWorks.Split(','); + string unitIds = string.Empty; + foreach (string s in ins) + { + var q = GetUnitWorkByUnitWorkName(projectId, s.Trim()).UnitWorkId; + unitIds += q + ","; + } + return unitIds.Substring(0, unitIds.LastIndexOf(',')); + } + else + { + return string.Empty; + } + } } } diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index 4e193bbb..136f269c 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -671,10 +671,10 @@ namespace BLL string unitIds = string.Empty; foreach (string s in ins) { - var q = BLL.UnitService.getUnitByUnitName(s); - unitIds = unitIds + q.UnitId + ","; + var q = getUnitByUnitName(s.Trim()); + unitIds += q.UnitId + ","; } - return unitIds.Substring(0, unitIds.Length - 1); + return unitIds.Substring(0, unitIds.LastIndexOf(",")); } else { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs index 5dbff734..10c4bd77 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 11); + AddDatasetToSQL(ds.Tables[0], 12); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); @@ -196,35 +201,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive } string row2 = pds.Rows[i][2].ToString(); - if (string.IsNullOrEmpty(row2)) + if (!string.IsNullOrEmpty(row2)) { - result += (i + 2).ToString() + "," + "图纸内容" + "," + "此项为必填项！" + "|"; - } - - string row4 = pds.Rows[i][4].ToString(); - if (!string.IsNullOrEmpty(row4)) - { - try + string[] reunit = row2.Split(','); + foreach (string unitWork in reunit) { - Int32 date = Convert.ToInt32(row4.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "页数" + "," + "[" + row4 + "]错误！" + "|"; + var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|"; + } } } string row5 = pds.Rows[i][5].ToString(); - if (!string.IsNullOrEmpty(row5)) + if (string.IsNullOrEmpty(row5)) { - try - { - DateTime date = Convert.ToDateTime(row5.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row5 + "]错误！" + "|"; - } + result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; } string row6 = pds.Rows[i][6].ToString(); @@ -232,38 +225,53 @@ namespace FineUIPro.Web.CQMS.Comprehensive { try { - DateTime date = Convert.ToDateTime(row6.Trim()); + Int32 date = Convert.ToInt32(row6.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row6 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "页数" + "," + "[" + row6 + "]错误！" + "|"; } } string row7 = pds.Rows[i][7].ToString(); if (!string.IsNullOrEmpty(row7)) { - string[] reunit = row7.Split(','); - foreach (string unit in reunit) + try { - var u = units.Where(x => x.UnitName == unit).FirstOrDefault(); - if (u == null) - { - result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|"; - } + DateTime date = Convert.ToDateTime(row7.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row7 + "]错误！" + "|"; } } - string row10 = pds.Rows[i][10].ToString(); - if (string.IsNullOrEmpty(row10)) + string row8 = pds.Rows[i][8].ToString(); + if (!string.IsNullOrEmpty(row8)) { - result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|"; + try + { + DateTime date = Convert.ToDateTime(row8.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row8 + "]错误！" + "|"; + } + } + + string row9 = pds.Rows[i][9].ToString(); + if (!string.IsNullOrEmpty(row9)) + { + string[] reunit = row9.Split(','); + foreach (string unit in reunit) + { + var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|"; + } + } } - //} - //else - //{ - // result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|"; - //} } if (!string.IsNullOrEmpty(result)) { @@ -369,7 +377,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 11); + AddDatasetToSQL2(ds.Tables[0], 12); } catch (Exception ex) { @@ -408,72 +416,84 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { Model.Comprehensive_DesignDrawings oldViewInfo = new Model.Comprehensive_DesignDrawings(); string row0 = pds.Rows[i][0].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][5].ToString().Trim() ).FirstOrDefault(); if (oldViewInfo == null) { Model.Comprehensive_DesignDrawings des = new Model.Comprehensive_DesignDrawings(); des.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); des.ProjectId = this.CurrUser.LoginProjectId; - des.CNProfessionalId = cn.CNProfessionalId; - des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim(); - des.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim(); - des.Edition = pds.Rows[i][3].ToString().Trim(); - if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim())) + des.CNProfessionalId = cn.CNProfessionalId;//专业名称 + des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号 + if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程 { - des.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim()); - } - if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) - { - des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim()); + des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim()); } + des.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容 + des.Edition = pds.Rows[i][4].ToString().Trim();//版次 + des.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号 if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim())) { - des.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim()); + des.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数 } if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][7].ToString().Trim()); + des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期 } - des.ReceiveMan = pds.Rows[i][8].ToString().Trim(); - des.Remark = pds.Rows[i][9].ToString().Trim(); - des.RemarkCode = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) + { + des.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期 + } + if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) + { + des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位 + } + des.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 + des.Remark = pds.Rows[i][11].ToString().Trim();//备注 BLL.DesignDrawingsService.AddDesignDrawings(des); } else { - oldViewInfo.CNProfessionalId = cn.CNProfessionalId; - oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim(); - oldViewInfo.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim(); - oldViewInfo.Edition = pds.Rows[i][3].ToString().Trim(); - if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim())) + oldViewInfo.CNProfessionalId = cn.CNProfessionalId;//专业名称 + oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号 + if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程 { - oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim()); - } - if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) - { - oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim()); + oldViewInfo.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim()); } + oldViewInfo.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容 + oldViewInfo.Edition = pds.Rows[i][4].ToString().Trim();//版次 + oldViewInfo.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号 if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim())) { - oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim()); + oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数 } if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - oldViewInfo.ReceiveUnits = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == (pds.Rows[i][7].ToString().Trim())).UnitId; + oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期 } - oldViewInfo.ReceiveMan = pds.Rows[i][8].ToString().Trim(); - oldViewInfo.Remark = pds.Rows[i][9].ToString().Trim(); - oldViewInfo.RemarkCode = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) + { + oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期 + } + if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) + { + oldViewInfo.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位 + } + oldViewInfo.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人 + oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();//备注 BLL.DesignDrawingsService.UpdateDesignDrawings(oldViewInfo); } } - } else { @@ -484,7 +504,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive #endregion #endregion - #region 下载模板 /// /// 下载模板按钮 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs index 292b42e1..3501480b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 10); + AddDatasetToSQL(ds.Tables[0], 13); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { string row0 = pds.Rows[i][0].ToString(); @@ -225,40 +230,72 @@ namespace FineUIPro.Web.CQMS.Comprehensive string row5 = pds.Rows[i][5].ToString(); if (!string.IsNullOrEmpty(row5)) { - string[] reunit = row5.Split(','); - foreach (string unit in reunit) + if (row5 != "过程监督不到位" && row5 != "质量缺陷" && row5 != "质量管理问题" && row5 != "不按设计要求施工" && row5 != "不按程序施工" && row5 != "成品保护不到位") { - var u = units.Where(x => x.UnitName == unit).FirstOrDefault(); - if (u == null) - { - result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|"; - } + result += (i + 2).ToString() + "," + "问题类别" + "," + "[" + row5 + "]错误！" + "|"; } } string row7 = pds.Rows[i][7].ToString(); if (!string.IsNullOrEmpty(row7)) { - try + string[] reunit = row7.Split(','); + foreach (string unitWork in reunit) { - DateTime date = Convert.ToDateTime(row7.Trim()); - } - catch (Exception) - { - result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row7 + "]错误！" + "|"; + var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|"; + } } } string row8 = pds.Rows[i][8].ToString(); if (!string.IsNullOrEmpty(row8)) + { + string[] reunit = row8.Split(','); + foreach (string unit in reunit) + { + var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault(); + if (u == null) + { + result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|"; + } + } + } + + string row9 = pds.Rows[i][9].ToString().Trim(); + if (!string.IsNullOrEmpty(row9)) + { + if (row9 != "整改中" && row9 != "已闭合") + { + result += (i + 2).ToString() + "," + "实施状态" + "," + "[" + row9 + "]错误！" + "|"; + } + } + + string row11 = pds.Rows[i][11].ToString(); + if (!string.IsNullOrEmpty(row11)) { try { - DateTime date = Convert.ToDateTime(row8.Trim()); + DateTime date = Convert.ToDateTime(row11.Trim()); } catch (Exception) { - result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row8 + "]错误！" + "|"; + result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row11 + "]错误！" + "|"; + } + } + + string row12 = pds.Rows[i][12].ToString(); + if (!string.IsNullOrEmpty(row12)) + { + try + { + DateTime date = Convert.ToDateTime(row12.Trim()); + } + catch (Exception) + { + result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|"; } } } @@ -366,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 10); + AddDatasetToSQL2(ds.Tables[0], 13); } catch (Exception ex) { @@ -405,6 +442,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive var cns = from x in Funs.DB.Base_CNProfessional select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && x.SuperUnitWork == null + select x; + for (int i = 0; i < ir; i++) { Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement(); @@ -426,20 +468,27 @@ namespace FineUIPro.Web.CQMS.Comprehensive { des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim()); } - if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim())) - { - des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][5].ToString().Trim()); - } - des.ImplementationFrontState = pds.Rows[i][6].ToString().Trim(); + des.Problem = pds.Rows[i][5].ToString().Trim(); + des.Measure = pds.Rows[i][6].ToString().Trim(); if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim())) { - des.ClosedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim()); + des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim()); } if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim())) { - des.CompleteDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim()); + des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim()); + } + + des.ImplementationFrontState = pds.Rows[i][9].ToString().Trim(); + des.ResponsibleMan = pds.Rows[i][10].ToString().Trim(); + if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim())) + { + des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim()); + } + if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim())) + { + des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); } - des.ResponsibleMan = pds.Rows[i][9].ToString().Trim(); BLL.NCRManagementService.AddNCRManagement(des); } } @@ -454,7 +503,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive #endregion #endregion - #region 下载模板 /// /// 下载模板按钮 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index b0d36bb2..bd1f658c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -35,7 +35,7 @@ - + diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 56e6d7c8..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,215 +0,0 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:无法绑定由多个部分组成的标识符 "chec.InspectionDate"。 -无法绑定由多个部分组成的标识符 "chec.InspectionDate"。 -错误堆栈: - 在 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.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.DataShow.InspectionManagementItem.BindGrid() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\DataShow\InspectionManagementItem.aspx.cs:行号 74 - 在 FineUIPro.Web.DataShow.InspectionManagementItem.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\DataShow\InspectionManagementItem.aspx.cs:行号 32 - 在 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/17/2024 17:23:37 -出错文件:http://localhost:8579/DataShow/InspectionManagementItem.aspx?projectId=32d0bca0-7693-4bd6-813d-6ee174ba29d3 -IP地址:::1 -操作人员:JT - -出错时间:04/17/2024 17:23:37 - - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: source -错误堆栈: - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInvocation(InvocationExpression invoke) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitContains(Expression sequence, Expression value) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitExpression(Expression exp) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitWhere(Expression sequence, LambdaExpression predicate) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitAggregate(Expression sequence, LambdaExpression lambda, SqlNodeType aggType, Type returnType) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 FineUIPro.Web.common.main_new.getZlgj() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 544 - 在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 91 - 在 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/18/2024 11:19:17 -出错文件:http://localhost:8579/common/main_new.aspx -IP地址:::1 -操作人员:JT - -出错时间:04/18/2024 11:19:17 - - -错误信息开始=====> -错误类型: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/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型: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/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型: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/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型: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/18/2024 12:51:29 -出错时间:04/18/2024 12:51:29 - - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: source -错误堆栈: - 在 System.Linq.Enumerable.OfType[TResult](IEnumerable source) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitContains(Expression sequence, Expression value) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitExpression(Expression exp) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitWhere(Expression sequence, LambdaExpression predicate) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitAggregate(Expression sequence, LambdaExpression lambda, SqlNodeType aggType, Type returnType) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc) - 在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node) - 在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 FineUIPro.Web.common.main_new.getZlgj() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 546 - 在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 92 - 在 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/18/2024 14:10:41 -出错文件:http://localhost:8579/common/main_new.aspx -IP地址:::1 -操作人员:JT - -出错时间:04/18/2024 14:10:41 - diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls index 877d056a592632b0fc02ab9c0fccb6fc6c3b395a..ff2cba5f0bf54b5602eeb5831fd98f4fd1cf315f 100644 GIT binary patch delta 2900 zcmbtWdu&tZ6+hqgJ9hktAJ=gl+lfu$IEn2zPbUsIsha@mAQZOIu`Fe4`j}ckG}Q#O zjnUZHmZF9HfTGf}bbnMU(*`V6D{W;BTSeKViE2XX#45E?X(!ee(6(-enxO5pndw&M z7%;BKVPjtZ^Wlp%c-y#Iyp0tm^=1mAC0JcSuPQtXeU}t5wQ2p@HuBI}#%6qIO5vE< zkL@N8J}?C^ZT8_ZcRg--#WAPb8 zGxpn6OxykFarp3pJ%E*VpD-irP=y6+9Vwh~_<2w7*i>PYw7QZP@JY!@be=|7tRb3@ zyvqx-!{Jng11mHtJ=v%1dBEj*+WNGW^eN5Lg{@Aty6SUQi)MA>M{M;hSkKeFECv>4 zF`&fxy?D*8R{IuwUSdIB`c^H2ij+$gevG+>nTD&Re9o!j1y`D-Nr&q8v$M8`#Yh#; zyHa@5Zd{DGa#M77RTIAF3RQnTu0@-Xv$DrFyAi*3`8mUDF4b+|IRx=8Wstm-d7Q4Q zh23rZCTn|Ku6!h~XRVgONNr{B+^zb>EVucaIH8vPHvKLB`n( z=070n@UD9lSE{>3J>yaA33Q7nhH45ThN+s3{7hbCxdH$1bl_^hDH_ofESTcjEczRB zo8gQ^MH8+C3;0#QhLyG1nHn3i{;X($s3|yF%kJ8u#_u;^x8IHVnpV77+b2>u;?q*& zk)RD~C@b1<#9f{&gX5k8aOyn1(Q0 z*V3&kLD7?|sMmN^(V%g6(Wr4x(WG&2(X4S_(Zbw9D(;WQb(O>qK`bMxad#}iWqTsl zC2H^zYl8SoEY0>>Jhm*2OVM_ng~CYI$C*c!Eo)%U7JS%{ z*VR!grW-;y9`)cs_DXWhM%Jd-dn0?L@lliXYSX;-)_Y*6Z(y9!a__D0Ww~9;EN#o8 zGIIw~i9xQ9%sZXPi7w4|I^jVnA!EBWe~B+>E9pVJc~E4f|4dva?3DpCyzb|k<6Jjh zw*=Q1fW5GxZ)kY2+qA@P8F&ACQpP8eZPL033UEFIfO^j#9Ti2xMZ=)X{G;gq! zbR?qt{=MdxYm6jze}C{{@zswHzCRv*faiN^lk@9REKvoo=_g$n%Vm_kz4$|Zgdg?L z!1K*dkWFrkUaWGELVA)|@Evh4VTCQHT?07L-#V!}mh?t4(x`6L z!WQCQ4KLveUe#vX61I|+_T7}<#%noiU$R$HjF ziaeL1LemXuw2TA|@&@UKO`$t@dkaWM1%8(;AUz}fA~GhTt5{yl4nmMc~CvYdwUJaV|Y+~l4zJ84R$ zzj5713by3^;vyU?4rz7$-T&t^R~irsX7!$#Ld-AMDu0h;pU7jD$1X8)ieFqmx$dW8 zX2@q+uKX-}?W1AT4ozXY&(OwB+9Cfh&bs-MG-&*KSwwQE8mVDt#r1GmPlR>DA&d=M zP#m7c?C{V-1uaG^msa7zQF-L^CFYDZzJPDx|8mI1Tj=xv(Virc#Nsxr+=MGoH<(3n z<+IT*^P|3nfADs2e4a<~WZ+!GTW7elSU!`Me~4JIYWK|Q38RBmPYI4(J@@+RoWT65 zd_SwS>Pjw;Lw1k6(mdo2CM4iYk28@?xQB;qzY`Lp^RD(uiDV0|;x_$~)bcpN3b)jA z56HukpZ5&s>}1-?@1+bSnI>5yc^7rFCd)q3H^!rfyR(fS0%?;`1I#nj!FLbeS;n2* bm4h-Wz-)j)hWQ;#dzhwaj6*ZL(^virx)FHv delta 2434 zcmb7GeQaA-6+hR0_Ol(we$RgP^H=;4f5dT|&$?}#CY@`neo;lKm{91tEkUcGP}&U* zA=b6=kU$!&WA$&afyx&C;Hv^{RbYZhV?lIO`=d}$rLqY@5Sj!-qkyy`0joLpxsK8P z<38Pc?(dx6IX?H?ckgp^RWvV%r)EXw(%cmxa&XvA_up=}+p=egD8F{zc1oOIQd-Ih z-{1Z|`|5P#x)@}`hJr_wv$oVM{-vB1b$rHgT6pk|V_Uz2#4a{JQ=Kr>Fg)%EX51Q%xDvRn#_%KVZ@3KXbtUnr zD~x}*B51LUaQ}sxz@R&Z%dP;%Sbvi7MVGdA&>eP&5|(`?9_&|<()~dnXZ=oFBYIlb zpXqz1kCbsdXg$pYI zlQsT+Q#h>AV~x5TwNUq$uG0cfh77-JniFRrZ>qT%PKVd-fu?D zE@vxQx5Y8w*Gz=<2*+w`X4Ko|U8g0U#=5b>xJxsIA79eVV6e;i0Z(L8MsP_R;0Vua z`|wvifTEscbiZ!$_=>)d$5db#o0>D~V!BndE#LB;TvwP;<8rw$uA8_OhzvTID~Jm$ zon*6h*5#ndj^5h}8lIjVXM2;ycUE2c4&Y+xqk#ix^1tgsXuZ5NuU2Ha^cuBED&XBkRY zf%Gk`XNK@%W)~jMgn+@as z4fqX@!?5Qo%qg{oleji&U~IHt5AlINK2)>&sf?NY4&H}{@+IDf3;7(okK?VpOlv~A zJX$vJ21gCiBtnI{n3Br!kby50iej5p2#MZgRFS4;(ZKJ9io8v-MiNzv(t8J9F4kD? zgkGwPX-Sm{f4)={Ri-YoX$Hqe>bzIdQU2`qa#76UzVZ<gYabl_wQuV94t^`i zDLz0SrDOa&%m?mse4&h2->aXp^xvMrk=fn-=PEY(4_zb=vpo3b?A@4|%g!hyp1bGe zV=sMDEICO$_IUk-IQsUN-#nK32wR@GNBgjx+DT;3{d<0WzRlhq`r&pWFX8Q40m zY&WLy`rHC9>ZtWgjxsvYbo#dotZx5@a(v$uk zcJUQ+#n;1ba?^BQ2a`=+^ztT>O|H#l<2%Qir#njFr*|z2(H_gfXoV+&p=5N7HmY-a zU1TReAN(#-7%5xGLGL4Z`E~r9Y;$fQm65uIT#V%H*kQUE$&bMe=8IK4QHw_gSY_9( zXo7Tp9FDJY7JtP3^{;S2Kep$!4u!qAb(TZ)e^AnEeT_ee*4|u3e&YGt!`njC&s}0a zOIa+PdtmMG-WT}O?``c5s|DLnUaL787})>Cm%E<+~t1D zR^%>MdQ<`q`T!5|JvqT$;LQ9sY|I;3S-~lqpzS=4@_C$~F&@V(xsxg^C)V`FviL7( Cm?eJz diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/图纸收发记录导入模板.xls index cba4076e3a7f6224cc489dbd8e1322ad5148e84e..c2cbc441544c5e5f3f9b425f70ed86b61cad2ca8 100644 GIT binary patch delta 2776 zcmbVOdu*Fm6+id0<45B7`Ni*7;>2<6By-+%;&id&q-iARLi!kt5Q^3@R@Rn~ZAxLa z|L8!hFed-1Ez>%PG-(o>G_|CZRVs9wrXmn*tyHO1iJ*}NNE1@WL{$lB&AFfRklOx% zxYoVr{LcB^^WE>9``zo(q9~mZFJ?vKso~!U(Tp198DEr$?o=uj*<-A?tm9Kt`$bv* zO{=|>cs^CWCYsnWQiH?#BT6KTf9a2iC$LcS9Z`#$H9etv5;=O5o}_Qk0q)>q|*OmucdR!{o~xPOV(#tSUdR=3f_3;Jh;@CTb8587HeNq@F@M4dKT#{QQX2ni)nI2-*P4sT`I%mSRX^*m6w_(>}*fDGM_#Eq;;||C9$oUBA&DvZi4%$6F z*M|48$Ew}|&8y-g_8Ql{m$^*TA6SpyfQsEC+&ItiJ?os)tjMNMX%W2G=GZ2@xMB6U zylmFizrpb#XAR*Ehu3$nFSIuQyu*WWE9ctkt;XT;%6d%JBhEG)a)epi;q>tMb;e5? zE;>1PPD8JgNQRe9sb(Agb=R?S-cHuyW8Wc`BqFqf6 zC+JyOyp7htnxJ~Fh>o?|4LdQf<1VfnCmPcDRMq2R!;|=G)Xppaz@4t~@hk-gJw7-+ zF5ySqlNJH&@f1W5CwL4Y?(LO)l--T^sn;$dSacoLv?xw`kBdgeGpP5e@CRI)y@~BJ z81N6^RZlIHz!0u`^vDHvi59#ZDBuZiEqZj0s+aj`W!E1aLhR6K!}a zSik|l1^*6aL<+0Cl6IW-7eoj8LIu%@!=VEH7^uY_cMA4k5Wfp$L>H!Ay)r7^3|cU! zW^jY0uc1wQQZMx30v19R>=CA}t{r5a7TN(N1; zC8H)AN+wOZOJ$e0*Pr~^4;$oD#aH-jaShLEd z+0vY5dI%Sq(-@5P=*$#Bu`$6iik&S@rQ9~i_6H=t92;b68pCap+9j#D+Nff8W1Mlf_JFI6lHQ|*m%gW)WcXf` z+VY}Ln~_bbxY?Ev{mg%uxdR$kT2n2Oy9Eo$yvS(WYi!-uDx(i-(XS=5Ts^sT>Diu2 zh%Dw(d9L4T%frh*PhGb9bN%w0F^Fk;oc8f=p1SBc{+x^%EDgF94C0-^t@VAMDD)rt zJz1D*fo`Z{LM5?l`g1$}GE;ZBe&?qPri%ZI$ExA?G%b0e~D(z6|UZ$-R~TE zZtCnK3WGUODm;*+5%{zS9cv&E=t zBZarYvrJIt!bZ0-KO8IO__;*4wL?ZnIqkryB0c4KZR@@oMl~DAz(^i_Ri=@VJn*W>#7LfI zRb*yl-axgC2Vy{gOcQC@V2Z!2B( z4F$ic)Lvop$N1HQFL8cXw*J<2pJ@o@yyAc5M6oOP*7Bjreo@Xx5moeU@(+t#u*_*a zcZubtDYGjtM!pD0UV-XzF25|w1-CJ*oZi>={ZWJp$NJX_vR;^bCC_}f!b4TwsjBEK z`0&7(z4lI|YA3?fSQxWoW|YR3urxM4URaxRx4dPOD>c)5IijPTL=ua;u(E-%BNxQT z_=(sa{$vhtmKS*P2=~${|3~pF7lfw2|KlIHY>@fY z^Jb9QkooTB*nK>9@HgH~oji83Maq5}U`vKMlH1HZr{Pidk8vNM9-cYMwq9m$VLiVl b$0*}xqnx~jO+D-=uscn&jJmOR^45O=2(4jX delta 2393 zcmb7GYiu0V6+U-&cJ|?YjrTFL@2A(ZYsarRjvYU{DkjrzUYu zol>6v!W$)AQFl!cWvQ{SDA*63`nye>zIXqgehM@CU*x#r%;Q%s6=QBc-f?Ad))hvN z%fOFaNqF1_e$9Bz8OJN!@{GUa>c%wd{_2Xt;P!iGQgP8QZOaqxyhBuQ$gktL&xwo{ z2x%O|^+u5BNlkmI?Ws0Wdhs=X1~2#x%jROxjUQ;LXv49fj{E(FP;pJuJ$~kW){q_Q z{*s8`n!lG-3+=iHBH+`71A78l=)QmmON>wa?%)dTWk!PNwd^Wyza0w!z3DH;5j5ji z;hYe)wQQ`_gbP;#dd$Ll_uN4QeKxXsu-}8ABkPh{SG_aypoGIctan zM#Fs~iKF4;=!*wM3PoOfBHGU_C^Gm9YqQuBO<^<=5;^RN^ocy`ks7}^Z*pHmFi{g7 z@I(hKehItN&Dc9JY1{{=5ylgS7xPgaQ*i~~i5_6tR#9f{lXxrc#r4bx0tqkX5+kA; zD@ILhLM%3m_Y)pG8XFb8xDl&iKIz2==@DGuad&)#-@a4vn%IoD<25{%^5RF#-h!(f z%Mcz&)^KOqiziYeSWJ8EN50~ONDYY*IMX%6GhRH)o(}R@%8ZCH%w=l$n9S166UbKOp71GXG#I95ty%najtXUXp7=k|_*8B!=zS6Hu5xUO1u5v0voyOW|g zRV=nCq}T11+`#3ICjTX~lu#&EcUio6-C>Q1x|>HgCGl#`wC5;g*`FzeaZhInfx>3H zk23gEZh)(y=PO)^YJP|-@koAvEAf+jA9IS#nPs~UT(xk?^08PBqfwSIcj9=VB1}BP zeHoVugUqSmV%MxaLS5)CP1ys~jhlrbuE1ciB6@JJSY%!=E)-=X$CiilqBzZ%qcTVxR6)R>{3|o8|<<7Fn zHIlZAquoJPr4@0$w;27P2^%EkD4ZO zGjgvZ4^3Gsz02&ESxWffgl?oLK=wAvz2Iu_12d5{gl7--m}wDXVmu5z?BnKq^3_FT4mj9 z4W=~5jX;{Ird#^;@m2{o@a??+^2bwJMgMdOTW1W4&+K zkHS%IQZDBq+}!!F>f>2aAXnYB{Kl>^fgQU|)OUvqGEoE6M_ahx#P3!g^>E)~jazAu L$G+uU^}P5GkhdW6 diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + From ae229cb24ecd691339b7a4c49f27671dd9cf6f77 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 19 Apr 2024 15:48:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comprehensive/InspectionPersonEdit.aspx | 2 +- SGGL/FineUIPro.Web/DataShow/GJSX.aspx | 116 +++++++++ SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs | 234 ++++++++++++++++++ .../DataShow/GJSX.aspx.designer.cs | 177 +++++++++++++ SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx | 118 +++++++++ SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs | 132 ++++++++++ .../DataShow/GJSXItem.aspx.designer.cs | 114 +++++++++ .../DataShow/InspectionManagementItem.aspx.cs | 78 +----- SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx | 68 +++-- SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs | 132 ++++++---- .../DataShow/WeldOneOK.aspx.designer.cs | 63 +++-- .../FineUIPro.Web/DataShow/WeldOneOKItem.aspx | 101 ++++++++ .../DataShow/WeldOneOKItem.aspx.cs | 106 ++++++++ .../DataShow/WeldOneOKItem.aspx.designer.cs | 150 +++++++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 24 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/FineUIPro.Web/common/main_new.aspx | 10 +- SGGL/FineUIPro.Web/common/main_new.aspx.cs | 55 ++-- SGGL/FineUIPro.Web/common/main_new1.aspx | 6 +- SGGL/FineUIPro.Web/common/main_new1.aspx.cs | 98 +++++--- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 22 files changed, 1565 insertions(+), 225 deletions(-) create mode 100644 SGGL/FineUIPro.Web/DataShow/GJSX.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx index 5e08b175..fa368162 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx @@ -27,7 +27,7 @@ - + diff --git a/SGGL/FineUIPro.Web/DataShow/GJSX.aspx b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx new file mode 100644 index 00000000..f2e79433 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx @@ -0,0 +1,116 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GJSX.aspx.cs" Inherits="FineUIPro.Web.DataShow.GJSX" %> + + + + + + + + + 关键事项数据 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs new file mode 100644 index 00000000..6cb52bff --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.cs @@ -0,0 +1,234 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.DataShow +{ + public partial class GJSX : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + // 绑定表格t + BindGrid(); + this.Panel1.Title = "关键事项数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 "; + List listStr = new List(); + string cpara = string.Empty; + if (this.drpProject.SelectedValue != Const._Null) + { + strSql += " AND projectId = @projectId"; ///状态为已完成 + listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue)); + } + + //if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + //{ + // strSql += " AND h.RegisterDate >=@StartTime"; + // listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text)); + + // cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text; + //} + //if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + //{ + // strSql += " AND h.RegisterDate <=@EndTime"; + // listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text)); + + // cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text; + //} + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid双击事件 编辑 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + EditData(); + } + + + /// + /// + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - "))); + } + #endregion + + + protected void btnView_Click(object sender, EventArgs e) + { + EditData(); + } + + /// + /// 数量 + /// + /// + /// + protected int Count1(object projectId) + { + int cout1 = 0; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString()); + if (datetime1.HasValue) + { + getT = getT.Where(x => x.CreateDate >= datetime1); + } + if (datetime2.HasValue) + { + getT = getT.Where(x => x.CreateDate <= datetime2); + } + + cout1 = getT.Count(); + } + return cout1; + } + + protected int Count2(object projectId) + { + int cout1 = 0; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); + if (datetime1.HasValue) + { + getT = getT.Where(x => x.InspectionDate >= datetime1); + } + if (datetime2.HasValue) + { + getT = getT.Where(x => x.InspectionDate <= datetime2); + } + + cout1 = getT.Count(); + } + return cout1; + } + + protected string Count4(object projectId) + { + string rate = string.Empty; + if (projectId != null) + { + var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); + var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); + var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); + + if (datetime1.HasValue) + { + getALL = getALL.Where(x => x.CheckDate >= datetime1); + } + if (datetime2.HasValue) + { + getALL = getALL.Where(x => x.CheckDate >= datetime1); + } + var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); + int coutall = getALL.Count(); + int cout0 = getT.Count(); + if (coutall > 0) + { + rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString(); + } + } + return rate; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs new file mode 100644 index 00000000..6624542d --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/GJSX.aspx.designer.cs @@ -0,0 +1,177 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow { + + + public partial class GJSX { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnView; + } +} diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx new file mode 100644 index 00000000..f7c82221 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx @@ -0,0 +1,118 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GJSXItem.aspx.cs" Inherits="FineUIPro.Web.DataShow.GJSXItem" %> + + + + + + + + + 关键事项详细 + + +
+ + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- + + + + + + + + --%> + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs new file mode 100644 index 00000000..6e6d7ba2 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.cs @@ -0,0 +1,132 @@ +using Aspose.Words; +using BLL; +using Org.BouncyCastle.Asn1.Ocsp; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DataShow +{ + public partial class GJSXItem : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string projectId = Request.Params["projectId"]; + this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId); + Funs.DropDownPageSize(this.ddlPageSize); + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格t + BindGrid(); + this.Panel1.Title = "关键事项数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = ""; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); + + listStr.Add(new SqlParameter("@sql_where", strSql)); + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + + /// + /// 获取检查人名称 + /// + /// + /// + protected string ConvertCheckMan(object CarryUnitIds) + { + var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds); + if (string.IsNullOrEmpty(uname)) + { + uname = CarryUnitIds.ToString(); + } + return uname; + + } + + protected string ConvertProgressDetail(object GJSXID) + { + string detailStr = string.Empty; + if (!string.IsNullOrEmpty(GJSXID.ToString())) + { + Model.GJSX_detail detail = (from x in Funs.DB.GJSX_detail where x.GJSXID == GJSXID.ToString() && x.Progress_detail != null && x.Progress_detail != "" orderby x.Date descending select x).FirstOrDefault(); + if (detail != null) + { + detailStr = detail.Progress_detail; + } + } + return detailStr; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs new file mode 100644 index 00000000..7fd82545 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx.designer.cs @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow { + + + public partial class GJSXItem { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProject; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs index e0ea345e..d4e89de6 100644 --- a/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs @@ -123,83 +123,7 @@ namespace FineUIPro.Web.DataShow BindGrid(); } #endregion - protected string ConvertImageUrlByImage(object registrationId) - { - string url = string.Empty; - string httpUrl = string.Empty; - var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); - if (sysSet6 != null) - { - httpUrl = sysSet6.SetValue; - } - if (registrationId != null) - { - IList sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId); - - if (sourlist != null && sourlist.Count > 0) - { - string AttachUrl = ""; - foreach (var item in sourlist) - { - if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) - AttachUrl += item.AttachUrl.TrimEnd(',') + ","; - } - url = BLL.UploadAttachmentService.ShowImage("../", AttachUrl.TrimEnd(',')); - } - } - return url; - } - protected string ConvertImgUrlByImage(object registrationId) - { - string url = string.Empty; - string httpUrl = string.Empty; - var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); - if (sysSet6 != null) - { - httpUrl = sysSet6.SetValue; - } - if (registrationId != null) - { - IList sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId); - - if (sourlist != null && sourlist.Count > 0) - { - string AttachUrl = ""; - foreach (var item in sourlist) - { - if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) - AttachUrl += item.AttachUrl.TrimEnd(',') + ","; - } - url = BLL.UploadAttachmentService.ShowImage("../", AttachUrl.TrimEnd(',')); - } - } - return url; - } - - public string Convertstatus(Object code) - { - Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString()); - if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) - { - return "未确认"; - } - else if (checkControl.State == Const.CheckControl_Complete) - { //闭环 - return "已闭环"; - } - //else if( checkControl.LimitDate> ) - else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 - { - return "超期未整改"; - - } - else //期内未整改 - { - return "未整改"; - - } - } - + /// /// 获取检查人名称 /// diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx index e6a14ddb..33747fec 100644 --- a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx @@ -26,16 +26,8 @@ - - - - - - - - + + @@ -52,17 +44,49 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -81,7 +105,7 @@ diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs index 7ef549cd..48736729 100644 --- a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.cs @@ -24,7 +24,7 @@ namespace FineUIPro.Web.DataShow BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); - this.Panel1.Title = "质量共检数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + this.Panel1.Title = "焊接一次合格数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; } } @@ -144,7 +144,7 @@ namespace FineUIPro.Web.DataShow return; } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionManagementItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldOneOKItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - "))); } #endregion @@ -159,76 +159,116 @@ namespace FineUIPro.Web.DataShow ///
/// /// - protected int Count1(object projectId) + protected int? Count1(object projectId) { - int cout1 = 0; + int? cout1 = null; if (projectId != null) { - var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); - var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); - var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); - if (datetime1.HasValue) + var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New + where x.ProfessionalName == "工艺管道" && x.ProjectId == projectId.ToString() + orderby x.CreateDate descending + select x).FirstOrDefault(); + if (getT != null && getT.TotalQuantity != null) { - getT = getT.Where(x => x.InspectionDate >= datetime1); + cout1 = getT.TotalQuantity.Value; } - if (datetime2.HasValue) - { - getT = getT.Where(x => x.InspectionDate <= datetime2); - } - - cout1 = getT.Count(); } return cout1; } - protected int Count2(object projectId) + protected string Count2(object projectId) { - int cout1 = 0; + string cout1 = null; if (projectId != null) { - var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); - var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); - var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); - if (datetime1.HasValue) + var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New + where x.ProfessionalName == "工艺管道" && x.ProjectId == projectId.ToString() + orderby x.CreateDate descending + select x).FirstOrDefault(); + if (getT != null) { - getT = getT.Where(x => x.InspectionDate >= datetime1); - } - if (datetime2.HasValue) - { - getT = getT.Where(x => x.InspectionDate <= datetime2); + cout1 = getT.TotalRate; } + } + return cout1; + } - cout1 = getT.Count(); + /// + /// 数量 + /// + /// + /// + protected int? Count3(object projectId) + { + int? cout1 = null; + if (projectId != null) + { + var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New + where x.ProfessionalName == "地管" && x.ProjectId == projectId.ToString() + orderby x.CreateDate descending + select x).FirstOrDefault(); + if (getT != null && getT.TotalQuantity != null) + { + cout1 = getT.TotalQuantity.Value; + } } return cout1; } protected string Count4(object projectId) { - string rate = string.Empty; + string cout1 = null; if (projectId != null) { - var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); - var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); - var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); - - if (datetime1.HasValue) + var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New + where x.ProfessionalName == "地管" && x.ProjectId == projectId.ToString() + orderby x.CreateDate descending + select x).FirstOrDefault(); + if (getT != null) { - getALL = getALL.Where(x => x.CheckDate >= datetime1); - } - if (datetime2.HasValue) - { - getALL = getALL.Where(x => x.CheckDate >= datetime1); - } - var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); - int coutall = getALL.Count(); - int cout0 = getT.Count(); - if (coutall > 0) - { - rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString(); + cout1 = getT.TotalRate; } } - return rate; + return cout1; + } + + /// + /// 数量 + /// + /// + /// + protected int? Count5(object projectId) + { + int? cout1 = null; + if (projectId != null) + { + var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New + where x.ProfessionalName == "非标" && x.ProjectId == projectId.ToString() + orderby x.CreateDate descending + select x).FirstOrDefault(); + if (getT != null && getT.TotalQuantity != null) + { + cout1 = getT.TotalQuantity.Value; + } + } + return cout1; + } + + protected string Count6(object projectId) + { + string cout1 = null; + if (projectId != null) + { + var getT = (from x in Funs.DB.ProcessControl_NondestructiveTest_New + where x.ProfessionalName == "非标" && x.ProjectId == projectId.ToString() + orderby x.CreateDate descending + select x).FirstOrDefault(); + if (getT != null) + { + cout1 = getT.TotalRate; + } + } + return cout1; } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs index fbaf87a8..83484e97 100644 --- a/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOK.aspx.designer.cs @@ -66,33 +66,6 @@ namespace FineUIPro.Web.DataShow { /// protected global::FineUIPro.DropDownList drpProject; - /// - /// txtStartTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtStartTime; - - /// - /// Label3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label3; - - /// - /// txtEndTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtEndTime; - /// /// btnClose 控件。 /// @@ -129,6 +102,42 @@ namespace FineUIPro.Web.DataShow { /// protected global::System.Web.UI.WebControls.Label Label5; + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label6; + /// /// ToolbarSeparator1 控件。 /// diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx new file mode 100644 index 00000000..e3f3b440 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx @@ -0,0 +1,101 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldOneOKItem.aspx.cs" Inherits="FineUIPro.Web.DataShow.WeldOneOKItem" %> + + + + + + + + + 焊接一次合格率详细 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs new file mode 100644 index 00000000..32166f59 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.cs @@ -0,0 +1,106 @@ +using Aspose.Words; +using BLL; +using Org.BouncyCastle.Asn1.Ocsp; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.DataShow +{ + public partial class WeldOneOKItem : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string projectId = Request.Params["projectId"]; + this.txtProject.Text = ProjectService.GetProjectNameByProjectId(projectId); + Funs.DropDownPageSize(this.ddlPageSize); + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格t + BindGrid(); + this.Panel1.Title = "焊接一次合格率数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）"; + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT N.*, U.UnitName " + + @" FROM ProcessControl_NondestructiveTest_New AS N" + + @" LEFT JOIN Base_Unit AS U ON U.UnitId = N.UnitId" + + @" WHERE N.ProjectId=@projectId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); + + strSql += " AND (N.CreateDate>=@startTime or @startTime='') and (N.CreateDate<=@endTime or @endTime='') "; + listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "")); + listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "")); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs new file mode 100644 index 00000000..1cfe32c9 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/WeldOneOKItem.aspx.designer.cs @@ -0,0 +1,150 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow { + + + public partial class WeldOneOKItem { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProject; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// lbtnFileUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 1057cae7..aa09bb51 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -599,6 +599,8 @@ + + @@ -628,6 +630,7 @@ + @@ -8568,6 +8571,20 @@ Environmental.aspx + + GJSX.aspx + ASPXCodeBehind + + + GJSX.aspx + + + GJSXItem.aspx + ASPXCodeBehind + + + GJSXItem.aspx + HiddenRectification.aspx ASPXCodeBehind @@ -8771,6 +8788,13 @@ WeldOneOK.aspx + + WeldOneOKItem.aspx + ASPXCodeBehind + + + WeldOneOKItem.aspx + WorkingHours.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 9e91deff..63ca13cc 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true false diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..963148f2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx index 3f9a9080..947da205 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx +++ b/SGGL/FineUIPro.Web/common/main_new.aspx @@ -108,7 +108,7 @@
-
关键事项 更多>
+
关键事项 更多>