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 01/11] =?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 02/11] =?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 03/11] =?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 04/11] =?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 @@
-
关键事项 更多>
+
关键事项 更多>
- + From 5d9374cdd71cce987b603ca0584f175f3eb02e94 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 22 Apr 2024 11:19:05 +0800 Subject: [PATCH 09/11] =?UTF-8?q?20240422=20=E7=BB=BC=E5=90=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-04-22-bwj.sql | 7 + .../Comprehensive/DataReceivingDocService.cs | 1 + .../Comprehensive/DesignChangeOrderService.cs | 2 + .../Comprehensive/InspectionMachineService.cs | 2 + .../Comprehensive/InspectionPersonService.cs | 2 + .../Comprehensive/NCRManagementService.cs | 1 + SGGL/BLL/Common/Const.cs | 2 +- .../CQMS/Comprehensive/DataReceivingDoc.aspx | 2 +- .../Comprehensive/DataReceivingDocDataIn.aspx | 231 +--- .../DataReceivingDocDataIn.aspx.cs | 1123 ++++++++--------- .../DataReceivingDocDataIn.aspx.designer.cs | 180 +-- .../DesignChangeOrderDataIn.aspx.cs | 13 +- .../InspectionMachineDataIn.aspx.cs | 17 +- .../InspectionPersonDataIn.aspx.cs | 18 +- .../Comprehensive/NCRManagementDataIn.aspx.cs | 13 +- .../File/Excel/DataIn/NCR管理导入模板.xls | Bin 20480 -> 20480 bytes .../File/Excel/DataIn/人员报验导入模板.xls | Bin 20480 -> 19968 bytes .../File/Excel/DataIn/机具报验导入模板.xls | Bin 20480 -> 19968 bytes .../File/Excel/DataIn/设计变更单导入模板.xls | Bin 19456 -> 19968 bytes .../DataIn/资料收发文登记记录导入模板.xls | Bin 0 -> 19968 bytes .../DataIn/资料收发文登记记录导入模板.xlsx | Bin 10494 -> 0 bytes SGGL/Model/Model.cs | 120 ++ 22 files changed, 765 insertions(+), 969 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls delete mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql new file mode 100644 index 00000000..a715e653 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql @@ -0,0 +1,7 @@ + +alter table Comprehensive_InspectionPerson add RemarkCode nvarchar(50) +alter table Comprehensive_InspectionMachine add RemarkCode nvarchar(50) +alter table Comprehensive_DesignChangeOrder add RemarkCode nvarchar(50) +alter table Comprehensive_NCRManagement add RemarkCode nvarchar(50) +alter table Comprehensive_DataReceivingDoc add RemarkCode nvarchar(50) + diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs index 9dac14b5..d199e432 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs @@ -65,6 +65,7 @@ namespace BLL CompileDate = doc.CompileDate, Status = doc.Status, AuditMan = doc.AuditMan, + RemarkCode = doc.RemarkCode }; Funs.DB.Comprehensive_DataReceivingDoc.InsertOnSubmit(newDoc); Funs.DB.SubmitChanges(); diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs index d53ea1f7..8003bf0f 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs @@ -197,6 +197,7 @@ namespace BLL newDesignChangeOrder.CompileDate = desginChangeOrder.CompileDate; newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate; newDesignChangeOrder.Status = desginChangeOrder.Status; + newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode; db.Comprehensive_DesignChangeOrder.InsertOnSubmit(newDesignChangeOrder); db.SubmitChanges(); } @@ -225,6 +226,7 @@ namespace BLL newDesignChangeOrder.ImplementationFrontState = desginChangeOrder.ImplementationFrontState; newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate; newDesignChangeOrder.Status = desginChangeOrder.Status; + newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs index ca1d601b..7d002b8d 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs @@ -128,6 +128,7 @@ namespace BLL newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount; newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate; newInspectionMachine.Status = inspectionMachine.Status; + newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode; db.Comprehensive_InspectionMachine.InsertOnSubmit(newInspectionMachine); db.SubmitChanges(); } @@ -159,6 +160,7 @@ namespace BLL newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount; newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate; newInspectionMachine.Status = inspectionMachine.Status; + newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs index 179687e2..c31f907b 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs @@ -61,6 +61,7 @@ namespace BLL newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId; newInspectionPerson.Status = inspectionPerson.Status; newInspectionPerson.IsTrain = inspectionPerson.IsTrain; + newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode; db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson); db.SubmitChanges(); } @@ -92,6 +93,7 @@ namespace BLL newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId; newInspectionPerson.Status = inspectionPerson.Status; newInspectionPerson.IsTrain = inspectionPerson.IsTrain; + newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index ea7fe758..1e5b5755 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -118,6 +118,7 @@ namespace BLL newNCRManagement.Status = nCRManagement.Status; newNCRManagement.Problem = nCRManagement.Problem; newNCRManagement.Measure = nCRManagement.Measure; + newNCRManagement.RemarkCode = nCRManagement.RemarkCode; db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement); db.SubmitChanges(); } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 841ddca2..69a4d707 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3244,7 +3244,7 @@ namespace BLL /// /// 资料收发文登记记录导入模板原始虚拟路径 /// - public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xlsx"; + public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls"; /// /// 培训记录导入模板原始虚拟路径 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx index 02d5d8a7..0a2e1e10 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx @@ -156,7 +156,7 @@ <%-- /// lblPageIndex 控件。 @@ -164,104 +119,5 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - - /// - /// ToolbarSeparator1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - - /// - /// ToolbarText1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarText ToolbarText1; - - /// - /// ddlPageSize 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList ddlPageSize; - - /// - /// lbDataCout 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label lbDataCout; - - /// - /// Window1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window1; - - /// - /// Window2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window2; - - /// - /// ContentPanel3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ContentPanel ContentPanel3; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuEdit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; - - /// - /// ScriptManager2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.ScriptManager ScriptManager2; } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs index 67bfcaca..2c75e04f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 10); + AddDatasetToSQL(ds.Tables[0], 11); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -246,6 +246,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive } } + string row10 = pds.Rows[i][10].ToString(); + if (string.IsNullOrEmpty(row10)) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; + } } if (!string.IsNullOrEmpty(result)) { @@ -351,7 +356,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 10); + AddDatasetToSQL2(ds.Tables[0], 11); } catch (Exception ex) { @@ -391,7 +396,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; for (int i = 0; i < ir; i++) { - var oldViewInfo = oldViewInfos.Where(x => x.ChangeOrderCode == pds.Rows[i][2].ToString().Trim()).FirstOrDefault(); + var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim()).FirstOrDefault(); if (oldViewInfo == null) { Model.Comprehensive_DesignChangeOrder Ins = new Model.Comprehensive_DesignChangeOrder(); @@ -443,7 +448,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.HandleState = "3"; } } - + Ins.RemarkCode = pds.Rows[i][10].ToString().Trim(); Ins.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs index 44f45368..02b1053e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 13); + AddDatasetToSQL(ds.Tables[0], 14); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -278,13 +278,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row12 + "]错误！" + "|"; } } + string row13 = pds.Rows[i][13].ToString(); + if (string.IsNullOrEmpty(row13)) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; + } } - else { result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|"; } - } if (!string.IsNullOrEmpty(result)) { @@ -390,7 +393,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 13); + AddDatasetToSQL2(ds.Tables[0], 14); } catch (Exception ex) { @@ -437,7 +440,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine(); oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId - && x.InspectionMachineCode == pds.Rows[i][1].ToString().Trim()); + && x.RemarkCode == pds.Rows[i][13].ToString().Trim()); if (oldViewInfo==null) { Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine(); @@ -483,7 +486,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); } - + Ins.RemarkCode = pds.Rows[i][13].ToString().Trim(); Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine)); Ins.CompileMan = this.CurrUser.UserId; Ins.CompileDate = DateTime.Now.Date; @@ -533,8 +536,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive { oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); } + oldViewInfo.RemarkCode = pds.Rows[i][13].ToString().Trim(); - oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; BLL.InspectionMachineService.UpdateInspectionMachine(oldViewInfo); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs index 0fc1f39e..a70751ce 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 12); + AddDatasetToSQL(ds.Tables[0], 13); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -273,15 +273,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row10 + "]错误！" + "|"; } } - - + string row12 = pds.Rows[i][12].ToString(); + if (string.IsNullOrEmpty(row12)) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; + } } - else { result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|"; } - } if (!string.IsNullOrEmpty(result)) { @@ -387,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 12); + AddDatasetToSQL2(ds.Tables[0], 13); } catch (Exception ex) { @@ -435,7 +436,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (unitInfo != null && !string.IsNullOrEmpty(row0)) { oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId - && x.CertificateNumber == pds.Rows[i][5].ToString().Trim() + && x.RemarkCode == pds.Rows[i][12].ToString().Trim() ).FirstOrDefault(); if (oldViewInfo == null) { @@ -473,6 +474,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive Ins.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim()); } Ins.Remark = pds.Rows[i][11].ToString().Trim(); + Ins.RemarkCode = pds.Rows[i][12].ToString().Trim(); Ins.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); Ins.CompileMan = this.CurrUser.UserId; @@ -531,6 +533,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oldViewInfo.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim()); } oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim(); + oldViewInfo.RemarkCode= pds.Rows[i][12].ToString().Trim(); oldViewInfo.CompileMan = this.CurrUser.UserId; oldViewInfo.CompileDate = DateTime.Now.Date; @@ -594,7 +597,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 3501480b..44f2ae91 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], 13); + AddDatasetToSQL(ds.Tables[0], 14); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -298,6 +298,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|"; } } + + string row13 = pds.Rows[i][13].ToString(); + if (string.IsNullOrEmpty(row13)) + { + result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|"; + } } if (!string.IsNullOrEmpty(result)) { @@ -403,7 +409,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 13); + AddDatasetToSQL2(ds.Tables[0], 14); } catch (Exception ex) { @@ -453,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive string row0 = pds.Rows[i][0].ToString().Trim(); string row1 = pds.Rows[i][1].ToString().Trim(); var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault(); - oldViewInfo = oldViewInfos.Where(x => x.NCRCode == pds.Rows[i][2].ToString().Trim() + oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][13].ToString().Trim() ).FirstOrDefault(); if (oldViewInfo == null) { @@ -489,6 +495,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim()); } + des.RemarkCode = pds.Rows[i][13].ToString().Trim(); BLL.NCRManagementService.AddNCRManagement(des); } } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls index ff2cba5f0bf54b5602eeb5831fd98f4fd1cf315f..3e1ec99247f18e795fd2389ec1f0c4838162b9b9 100644 GIT binary patch delta 338 zcmZozz}T>WaYGIZ8^iWZdm^VyE@Ek8teyOmrJixp=1NvhKEVeJA`EN{h761hLJSNx zf`S~AtA!=mJQ%L*+N-j8mhex$$@3J27~LmtRFvC1S!t@Ip|Ax55U?=@Gh{HN0$~YI zb1Tr0RBLo`Be3|#$&og$>=KN8Kxw|oOKpCr^Dr>7XIzgLtN$L%@&9Oic7%u@uix2; zypf#$|1)qg@G*QeV_@K6nEcj3X7W*6A;zDRZ`l53Vi2Ev)y|KpTWGSXeVy_y8GZ&P z1{MYeCXl%dK<9%1h|R$y0AWu)W`9ulFVH{+23`htAZB2=4)p4c$vqAx+z|DQKz)px yPdglD+2kh1#O}tlYOcJW$7Wd%OC}bVdF+gngS^rvAMo1A$|MgAyv=pqO)LP4-c^_Y delta 284 zcmZozz}T>WaYGIZn}bgCW0pyii&)wixhMZ*sb}okT*=DGCsD&8!cfD(fCStb%GqsL zHg6LC$+!8A(o{*q_2wX1HpXCv42D!7EMYKYXk`##_-utPZUh#upS;M%mHjURFHo9y z@;jR!JpUQEfV>rE3=BLBlj9v_CTrRWF}6>(vHQ)mQfRWJy&sb}|Kv{lI%RWieg-B6 z76t|;K9JcAj9?OE5C@Y0ggsfy;UMdE1~!IMlm9uGY~JUzpK)`lV-MrzT9;QEC9_NNS^=z diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员报验导入模板.xls index 8efe39d583109b8546d7d21b122b932f7686675c..4fb6a79a582e79d1b732df4a42c9dc45d26dd509 100644 GIT binary patch literal 19968 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 KpsxR);eP;Hm*O7) literal 20480 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 literal 20480 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 delta 1118 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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx deleted file mode 100644 index 9b6ff15aa614e1c3e8909191ca286e19ee21a5c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10494 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 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index c3200bad..489e660d 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -88908,6 +88908,8 @@ namespace Model private string _AuditMan; + private string _RemarkCode; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -88970,6 +88972,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanged(); #endregion public Comprehensive_DataReceivingDoc() @@ -89493,6 +89497,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] + public string RemarkCode + { + get + { + return this._RemarkCode; + } + set + { + if ((this._RemarkCode != value)) + { + this.OnRemarkCodeChanging(value); + this.SendPropertyChanging(); + this._RemarkCode = value; + this.SendPropertyChanged("RemarkCode"); + this.OnRemarkCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DataReceivingDoc_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -89930,6 +89954,8 @@ namespace Model private string _AuditMan; + private string _RemarkCode; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -89976,6 +90002,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanged(); #endregion public Comprehensive_DesignChangeOrder() @@ -90358,6 +90386,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] + public string RemarkCode + { + get + { + return this._RemarkCode; + } + set + { + if ((this._RemarkCode != value)) + { + this.OnRemarkCodeChanging(value); + this.SendPropertyChanging(); + this._RemarkCode = value; + this.SendPropertyChanged("RemarkCode"); + this.OnRemarkCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignChangeOrder_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -94038,6 +94086,8 @@ namespace Model private string _AuditMan; + private string _RemarkCode; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -94090,6 +94140,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanged(); #endregion public Comprehensive_InspectionMachine() @@ -94532,6 +94584,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] + public string RemarkCode + { + get + { + return this._RemarkCode; + } + set + { + if ((this._RemarkCode != value)) + { + this.OnRemarkCodeChanging(value); + this.SendPropertyChanging(); + this._RemarkCode = value; + this.SendPropertyChanged("RemarkCode"); + this.OnRemarkCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_InspectionMachine_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -94957,6 +95029,8 @@ namespace Model private string _AuditMan; + private string _RemarkCode; + private EntityRef _Base_Post; private EntityRef _Base_Project; @@ -95017,6 +95091,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanged(); #endregion public Comprehensive_InspectionPerson() @@ -95467,6 +95543,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] + public string RemarkCode + { + get + { + return this._RemarkCode; + } + set + { + if ((this._RemarkCode != value)) + { + this.OnRemarkCodeChanging(value); + this.SendPropertyChanging(); + this._RemarkCode = value; + this.SendPropertyChanged("RemarkCode"); + this.OnRemarkCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_InspectionPerson_Base_Post", Storage="_Base_Post", ThisKey="PostId", OtherKey="PostId", IsForeignKey=true)] public Base_Post Base_Post { @@ -97434,6 +97530,8 @@ namespace Model private string _Problem; + private string _RemarkCode; + private EntityRef _Sys_User; private EntityRef _Base_CNProfessional; @@ -97484,6 +97582,8 @@ namespace Model partial void OnMeasureChanged(); partial void OnProblemChanging(string value); partial void OnProblemChanged(); + partial void OnRemarkCodeChanging(string value); + partial void OnRemarkCodeChanged(); #endregion public Comprehensive_NCRManagement() @@ -97891,6 +97991,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] + public string RemarkCode + { + get + { + return this._RemarkCode; + } + set + { + if ((this._RemarkCode != value)) + { + this.OnRemarkCodeChanging(value); + this.SendPropertyChanging(); + this._RemarkCode = value; + this.SendPropertyChanged("RemarkCode"); + this.OnRemarkCodeChanged(); + } + } + } + [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 { From 7baffe5c70f35719fc6142c3279f58deaa555d85 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 22 Apr 2024 11:21:48 +0800 Subject: [PATCH 10/11] =?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 --- .../FineUIPro.Web/common/mainProject2.aspx.cs | 106 +- SGGL/FineUIPro.Web/common/main_new1.aspx.cs | 12 +- SGGL/Model/Model.cs | 2935 ++++++++--------- 3 files changed, 1444 insertions(+), 1609 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 4f4d6b35..0536faf2 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -105,7 +105,7 @@ namespace FineUIPro.Web.common divCqmsPxNum.InnerHtml = CqmsPxNum.ToString(); //施工审批量 - int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count(); + int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == Const.CQMSConstructSolution_Complete).Count(); div_sgfaSpl.InnerHtml = sgspl.ToString(); GetJD(); //质量共检 @@ -405,12 +405,13 @@ namespace FineUIPro.Web.common { int result = 0; //机具报验的到期提醒和过期提醒记录数加一起 - //机具报验的到期提醒数 - var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId - && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count(); + ////机具报验的到期提醒数 + //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId + // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count(); //过期提醒记录数 var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now && x.ProjectId == ProjectId).Count(); - result = num1 + num2; + //result = num1 + num2; + result = num2; return result; } @@ -636,59 +637,64 @@ 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 where x.ProjectId == ProjectId 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 - // && a.ProjectId == ProjectId - // 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" - // && a.ProjectId == ProjectId - // select x.NDEItemID).Count(); - if (ndtLists.Count() > 0) + var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId orderby x.CreateDate descending select x).FirstOrDefault(); + decimal a = 0, b = 0; + if (ndtList != null) { - decimal a = 0, b = 0; - foreach (var item in ndtLists) + if (ndtList.TotalQuantity.HasValue) { - a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount); - b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount); + a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) / 100); + b += ndtList.TotalQuantity.Value; } - if (b > 0) + if (!string.IsNullOrEmpty(ndtList.TotalRate)) { - result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); - - hjallNumber = b.ToString(); - hjfinishNumber = a.ToString(); - hjzgl = result.ToString(); - hjDataValue = (100 - result).ToString(); + result = Convert.ToDouble(ndtList.TotalRate); } } - else + if (b > 0) { - var data = (from x in db.HJGL_FL_Data where x.ProjectId == ProjectId orderby x.CompileDate descending select x).FirstOrDefault(); - if (data != null) - { - decimal a = Funs.GetNewDecimalOrZero(data.OneTimeFilmQualifiedAmount); - decimal b = Funs.GetNewDecimalOrZero(data.OneTimeFilmAmount); - if (b > 0) - { - result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); - - hjallNumber = b.ToString(); - hjfinishNumber = a.ToString(); - hjzgl = result.ToString(); - hjDataValue = (100 - result).ToString(); - } - } + hjallNumber = b.ToString(); + hjfinishNumber = a.ToString(); + hjzgl = result.ToString(); + hjDataValue = (100 - result).ToString(); } + //var ndtLists = from x in db.HJGL_FL_NdtList where x.ProjectId == ProjectId 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); + // } + // if (b > 0) + // { + // result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); + + // hjallNumber = b.ToString(); + // hjfinishNumber = a.ToString(); + // hjzgl = result.ToString(); + // hjDataValue = (100 - result).ToString(); + // } + //} + //else + //{ + // var data = (from x in db.HJGL_FL_Data where x.ProjectId == ProjectId orderby x.CompileDate descending select x).FirstOrDefault(); + // if (data != null) + // { + // decimal a = Funs.GetNewDecimalOrZero(data.OneTimeFilmQualifiedAmount); + // decimal b = Funs.GetNewDecimalOrZero(data.OneTimeFilmAmount); + // if (b > 0) + // { + // result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); + + // hjallNumber = b.ToString(); + // hjfinishNumber = a.ToString(); + // hjzgl = result.ToString(); + // hjDataValue = (100 - result).ToString(); + // } + // } + //} } #endregion diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs index 9f7bd7b4..145b96ff 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs @@ -162,11 +162,12 @@ namespace FineUIPro.Web.common int result = 0; //机具报验的到期提醒和过期提醒记录数加一起 //机具报验的到期提醒数 - var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate - && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count(); + //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate + // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count(); //过期提醒记录数 var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count(); - result = num1 + num2; + //result = num1 + num2; + result = num2; return result; } @@ -200,9 +201,8 @@ namespace FineUIPro.Web.common private void getEarlyWarningCounts() { int allCount = 0; - var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality - join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId - where x.LimitDate.HasValue && x.LimitDate < DateTime.Now + var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson + where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true select x; //// 预警人数 allCount = getPersonQualitys.Count(); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index c3200bad..fb035807 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1457,9 +1457,6 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); - partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); - partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); - partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2018,9 +2015,6 @@ 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); @@ -2057,6 +2051,12 @@ namespace Model partial void InsertRunning_LogManagement(Running_LogManagement instance); partial void UpdateRunning_LogManagement(Running_LogManagement instance); partial void DeleteRunning_LogManagement(Running_LogManagement instance); + partial void InsertRunning_Maintenance(Running_Maintenance instance); + partial void UpdateRunning_Maintenance(Running_Maintenance instance); + partial void DeleteRunning_Maintenance(Running_Maintenance instance); + partial void InsertRunning_Operation(Running_Operation instance); + partial void UpdateRunning_Operation(Running_Operation instance); + partial void DeleteRunning_Operation(Running_Operation instance); partial void InsertSafetyData_SafetyData(SafetyData_SafetyData instance); partial void UpdateSafetyData_SafetyData(SafetyData_SafetyData instance); partial void DeleteSafetyData_SafetyData(SafetyData_SafetyData instance); @@ -6499,14 +6499,6 @@ namespace Model } } - public System.Data.Linq.Table Manager_Month_ComplianceObligations - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -7995,14 +7987,6 @@ namespace Model } } - public System.Data.Linq.Table Report_CQMS_ProblemHandle - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Report_CqmsTarget { get @@ -8099,6 +8083,22 @@ namespace Model } } + public System.Data.Linq.Table Running_Maintenance + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table Running_Operation + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table SafetyData_SafetyData { get @@ -21552,6 +21552,8 @@ namespace Model private string _CodeRule; + private EntitySet _Doc_DocManage; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21568,6 +21570,7 @@ namespace Model public Base_DocType() { + this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21651,6 +21654,19 @@ 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; @@ -21670,6 +21686,18 @@ 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")] @@ -97430,10 +97458,10 @@ namespace Model private string _AuditMan; - private string _Measure; - private string _Problem; + private string _Measure; + private EntityRef _Sys_User; private EntityRef _Base_CNProfessional; @@ -97480,10 +97508,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnMeasureChanging(string value); - partial void OnMeasureChanged(); partial void OnProblemChanging(string value); partial void OnProblemChanged(); + partial void OnMeasureChanging(string value); + partial void OnMeasureChanged(); #endregion public Comprehensive_NCRManagement() @@ -97851,27 +97879,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] - public string Measure - { - get - { - return this._Measure; - } - set - { - if ((this._Measure != value)) - { - this.OnMeasureChanging(value); - this.SendPropertyChanging(); - this._Measure = value; - this.SendPropertyChanged("Measure"); - this.OnMeasureChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")] public string Problem { get @@ -97891,6 +97899,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")] + public string Measure + { + get + { + return this._Measure; + } + set + { + if ((this._Measure != value)) + { + this.OnMeasureChanging(value); + this.SendPropertyChanging(); + this._Measure = value; + this.SendPropertyChanged("Measure"); + this.OnMeasureChanged(); + } + } + } + [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 { @@ -120085,6 +120113,8 @@ namespace Model private EntityRef _Base_CNProfessional; + private EntityRef _Base_DocType; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -120136,6 +120166,7 @@ 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); @@ -120214,6 +120245,10 @@ 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; @@ -120533,6 +120568,40 @@ 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 { @@ -120703,6 +120772,8 @@ namespace Model private EntityRef _Doc_DocManage; + private EntityRef _Sys_User; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -120726,6 +120797,7 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); + this._Sys_User = default(EntityRef); OnCreated(); } @@ -120773,7 +120845,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] public string ApproveMan { get @@ -120784,6 +120856,10 @@ 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; @@ -120907,6 +120983,40 @@ 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; @@ -234670,229 +234780,6 @@ 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 { @@ -241092,8 +240979,6 @@ namespace Model private EntitySet _Manager_Month_CheckC; - private EntitySet _Manager_Month_ComplianceObligations; - private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -241366,7 +241251,6 @@ 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)); @@ -243547,19 +243431,6 @@ 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 { @@ -244141,18 +244012,6 @@ 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(); @@ -272497,7 +272356,7 @@ namespace Model private System.Nullable _ProblemType; - private string _QuestionTechnologyId; + private string _SubInspectId; private string _TermItemId; @@ -272511,20 +272370,18 @@ 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); @@ -272541,8 +272398,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnQuestionTechnologyIdChanging(string value); - partial void OnQuestionTechnologyIdChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -272555,20 +272412,18 @@ 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() @@ -272696,22 +272551,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] - public string QuestionTechnologyId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId { get { - return this._QuestionTechnologyId; + return this._SubInspectId; } set { - if ((this._QuestionTechnologyId != value)) + if ((this._SubInspectId != value)) { - this.OnQuestionTechnologyIdChanging(value); + this.OnSubInspectIdChanging(value); this.SendPropertyChanging(); - this._QuestionTechnologyId = value; - this.SendPropertyChanged("QuestionTechnologyId"); - this.OnQuestionTechnologyIdChanged(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); } } } @@ -272836,6 +272691,26 @@ 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 { @@ -272856,6 +272731,26 @@ 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 { @@ -272916,66 +272811,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="_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; @@ -273017,14 +272852,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); @@ -273043,14 +272878,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() @@ -273198,6 +273033,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(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -273258,26 +273113,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(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -274210,7 +274045,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -274333,12 +274168,6 @@ namespace Model private string _InspectResult; - private System.Nullable _InspectTime; - - private string _AddUser; - - private System.Nullable _AddTime; - private string _Subcontractor; private string _Contractor; @@ -274347,12 +274176,6 @@ namespace Model private string _Owner; - private System.Nullable _IsUnifyWanderAbout; - - private System.Nullable _UnifyWanderAboutData; - - private string _UnifyWanderAboutOpinion; - private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -274363,7 +274186,9 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WanderIsComplete; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; private System.Nullable _SubcontractorAllPassData; @@ -274373,25 +274198,35 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderCompleteData; + private System.Nullable _WanderIsComplete; - private System.Nullable _WorkPackType; + private System.Nullable _WanderCompleteData; private System.Nullable _IsSiteImplement; - private System.Nullable _InspectIsClose; - - private System.Nullable _InspectCloseData; - - private string _InspectIsCloseUser; - - private string _PropertyTechnologyId; - - private System.Nullable _RecordUploadData; + private string _SiteImplementUser; private System.Nullable _SiteImplementConfirmData; - private string _SiteImplementUser; + private System.Nullable _RecordUploadData; + + private System.Nullable _InspectIsClose; + + private string _InspectIsCloseUser; + + private System.Nullable _InspectCloseData; + + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; #region 可扩展性方法定义 partial void OnLoaded(); @@ -274413,12 +274248,6 @@ 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); @@ -274427,12 +274256,6 @@ 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); @@ -274443,8 +274266,10 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -274453,26 +274278,36 @@ 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 OnInspectIsCloseChanging(System.Nullable value); - partial void OnInspectIsCloseChanged(); - partial void OnInspectCloseDataChanging(System.Nullable value); - partial void OnInspectCloseDataChanged(); - 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(); + 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(); #endregion public PreRun_SubInspectTerm() @@ -274640,66 +274475,6 @@ 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 { @@ -274780,66 +274555,6 @@ 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 { @@ -274940,22 +274655,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType { get { - return this._WanderIsComplete; + return this._WorkPackType; } set { - if ((this._WanderIsComplete != value)) + if ((this._WorkPackType != value)) { - this.OnWanderIsCompleteChanging(value); + this.OnWorkPackTypeChanging(value); this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); + 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(); } } } @@ -275040,6 +274775,26 @@ 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 { @@ -275060,26 +274815,6 @@ 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 { @@ -275100,102 +274835,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] - public System.Nullable InspectIsClose + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] + public string SiteImplementUser { get { - return this._InspectIsClose; + return this._SiteImplementUser; } set { - if ((this._InspectIsClose != value)) + if ((this._SiteImplementUser != value)) { - this.OnInspectIsCloseChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._InspectIsClose = value; - this.SendPropertyChanged("InspectIsClose"); - this.OnInspectIsCloseChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] - public System.Nullable InspectCloseData - { - get - { - return this._InspectCloseData; - } - set - { - if ((this._InspectCloseData != value)) - { - this.OnInspectCloseDataChanging(value); - this.SendPropertyChanging(); - this._InspectCloseData = value; - this.SendPropertyChanged("InspectCloseData"); - this.OnInspectCloseDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(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="_PropertyTechnologyId", DbType="NVarChar(500)")] - 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(); - } - } - } - - [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(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -275220,22 +274875,202 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] - public string SiteImplementUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._SiteImplementUser; + return this._RecordUploadData; } set { - if ((this._SiteImplementUser != value)) + if ((this._RecordUploadData != value)) { - this.OnSiteImplementUserChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] + public System.Nullable InspectIsClose + { + get + { + return this._InspectIsClose; + } + set + { + if ((this._InspectIsClose != value)) + { + this.OnInspectIsCloseChanging(value); + this.SendPropertyChanging(); + this._InspectIsClose = value; + this.SendPropertyChanged("InspectIsClose"); + this.OnInspectIsCloseChanged(); + } + } + } + + [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 + { + get + { + return this._InspectCloseData; + } + set + { + if ((this._InspectCloseData != value)) + { + this.OnInspectCloseDataChanging(value); + this.SendPropertyChanging(); + this._InspectCloseData = value; + this.SendPropertyChanged("InspectCloseData"); + this.OnInspectCloseDataChanged(); + } + } + } + + [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="_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(); } } } @@ -275303,6 +275138,22 @@ 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; @@ -275315,22 +275166,6 @@ 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); @@ -275371,6 +275206,22 @@ 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); @@ -275383,22 +275234,6 @@ 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() @@ -275766,6 +275601,166 @@ 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 { @@ -275786,7 +275781,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string PropertyTechnologyId { get @@ -275886,166 +275881,6 @@ 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; @@ -277047,6 +276882,8 @@ namespace Model private string _RestrictCondition; + private System.Nullable _ResponsibilityProposeSatate; + private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -277057,9 +276894,11 @@ namespace Model private System.Nullable _OwnerConfirm; + private System.Nullable _ProposeConfirmData; + private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeConfirmData; + private System.Nullable _ProposeHandleData; private System.Nullable _GeneraConfirmData; @@ -277075,10 +276914,6 @@ namespace Model private System.Nullable _Sort; - private System.Nullable _ResponsibilityProposeSatate; - - private System.Nullable _ProposeHandleData; - private string _FourDecisionCode; #region 可扩展性方法定义 @@ -277115,6 +276950,8 @@ 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); @@ -277125,10 +276962,12 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnResponsibilityConfirmDataChanging(System.Nullable value); - partial void OnResponsibilityConfirmDataChanged(); 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 OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -277143,10 +276982,6 @@ 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 @@ -277456,6 +277291,26 @@ 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 { @@ -277556,6 +277411,26 @@ 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 { @@ -277576,22 +277451,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData { get { - return this._ProposeConfirmData; + return this._ProposeHandleData; } set { - if ((this._ProposeConfirmData != value)) + if ((this._ProposeHandleData != value)) { - this.OnProposeConfirmDataChanging(value); + this.OnProposeHandleDataChanging(value); this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); } } } @@ -277736,46 +277611,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="_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 { @@ -278488,7 +278323,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -313373,164 +313208,6 @@ 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 { @@ -315843,52 +315520,12 @@ namespace Model private System.Nullable _EndData; - private System.Nullable _IsDesalinated; + private string _Situation; - private string _DesalinatedSituation; - - private string _DesalinatedRemarks; - - private System.Nullable _IsLoop; - - private string _LoopSituation; - - private string _LoopRemarks; - - private System.Nullable _IsSteam; - - private string _SteamSituation; - - private string _SteamRemarks; - - private System.Nullable _IsAirCompression; - - private string _AirCompressionSituation; - - private string _AirCompressionRemarks; - - private System.Nullable _IsCompoundAmmonia; - - private string _CompoundAmmoniaSituation; - - private string _CompoundAmmoniaRemarks; - - private System.Nullable _IsUrea; - - private string _UreaSituation; - - private string _UreaRemarks; + private string _Remarks; private string _HandoverCare; - private string _OperationReason; - - private string _OperationHandle; - - private string _MaintenanceReason; - - private string _MaintenanceHandle; - private string _AddUser; private System.Nullable _AddTime; @@ -315921,52 +315558,12 @@ namespace Model partial void OnStartDataChanged(); partial void OnEndDataChanging(System.Nullable value); partial void OnEndDataChanged(); - partial void OnIsDesalinatedChanging(System.Nullable value); - partial void OnIsDesalinatedChanged(); - partial void OnDesalinatedSituationChanging(string value); - partial void OnDesalinatedSituationChanged(); - partial void OnDesalinatedRemarksChanging(string value); - partial void OnDesalinatedRemarksChanged(); - partial void OnIsLoopChanging(System.Nullable value); - partial void OnIsLoopChanged(); - partial void OnLoopSituationChanging(string value); - partial void OnLoopSituationChanged(); - partial void OnLoopRemarksChanging(string value); - partial void OnLoopRemarksChanged(); - partial void OnIsSteamChanging(System.Nullable value); - partial void OnIsSteamChanged(); - partial void OnSteamSituationChanging(string value); - partial void OnSteamSituationChanged(); - partial void OnSteamRemarksChanging(string value); - partial void OnSteamRemarksChanged(); - partial void OnIsAirCompressionChanging(System.Nullable value); - partial void OnIsAirCompressionChanged(); - partial void OnAirCompressionSituationChanging(string value); - partial void OnAirCompressionSituationChanged(); - partial void OnAirCompressionRemarksChanging(string value); - partial void OnAirCompressionRemarksChanged(); - partial void OnIsCompoundAmmoniaChanging(System.Nullable value); - partial void OnIsCompoundAmmoniaChanged(); - partial void OnCompoundAmmoniaSituationChanging(string value); - partial void OnCompoundAmmoniaSituationChanged(); - partial void OnCompoundAmmoniaRemarksChanging(string value); - partial void OnCompoundAmmoniaRemarksChanged(); - partial void OnIsUreaChanging(System.Nullable value); - partial void OnIsUreaChanged(); - partial void OnUreaSituationChanging(string value); - partial void OnUreaSituationChanged(); - partial void OnUreaRemarksChanging(string value); - partial void OnUreaRemarksChanged(); + partial void OnSituationChanging(string value); + partial void OnSituationChanged(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); partial void OnHandoverCareChanging(string value); partial void OnHandoverCareChanged(); - partial void OnOperationReasonChanging(string value); - partial void OnOperationReasonChanged(); - partial void OnOperationHandleChanging(string value); - partial void OnOperationHandleChanged(); - partial void OnMaintenanceReasonChanging(string value); - partial void OnMaintenanceReasonChanged(); - partial void OnMaintenanceHandleChanging(string value); - partial void OnMaintenanceHandleChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); @@ -316200,362 +315797,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDesalinated", DbType="Int")] - public System.Nullable IsDesalinated + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Situation", DbType="VarChar(1000)")] + public string Situation { get { - return this._IsDesalinated; + return this._Situation; } set { - if ((this._IsDesalinated != value)) + if ((this._Situation != value)) { - this.OnIsDesalinatedChanging(value); + this.OnSituationChanging(value); this.SendPropertyChanging(); - this._IsDesalinated = value; - this.SendPropertyChanged("IsDesalinated"); - this.OnIsDesalinatedChanged(); + this._Situation = value; + this.SendPropertyChanged("Situation"); + this.OnSituationChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesalinatedSituation", DbType="VarChar(1000)")] - public string DesalinatedSituation + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="VarChar(1000)")] + public string Remarks { get { - return this._DesalinatedSituation; + return this._Remarks; } set { - if ((this._DesalinatedSituation != value)) + if ((this._Remarks != value)) { - this.OnDesalinatedSituationChanging(value); + this.OnRemarksChanging(value); this.SendPropertyChanging(); - this._DesalinatedSituation = value; - this.SendPropertyChanged("DesalinatedSituation"); - this.OnDesalinatedSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesalinatedRemarks", DbType="VarChar(1000)")] - public string DesalinatedRemarks - { - get - { - return this._DesalinatedRemarks; - } - set - { - if ((this._DesalinatedRemarks != value)) - { - this.OnDesalinatedRemarksChanging(value); - this.SendPropertyChanging(); - this._DesalinatedRemarks = value; - this.SendPropertyChanged("DesalinatedRemarks"); - this.OnDesalinatedRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLoop", DbType="Int")] - public System.Nullable IsLoop - { - get - { - return this._IsLoop; - } - set - { - if ((this._IsLoop != value)) - { - this.OnIsLoopChanging(value); - this.SendPropertyChanging(); - this._IsLoop = value; - this.SendPropertyChanged("IsLoop"); - this.OnIsLoopChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopSituation", DbType="VarChar(1000)")] - public string LoopSituation - { - get - { - return this._LoopSituation; - } - set - { - if ((this._LoopSituation != value)) - { - this.OnLoopSituationChanging(value); - this.SendPropertyChanging(); - this._LoopSituation = value; - this.SendPropertyChanged("LoopSituation"); - this.OnLoopSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopRemarks", DbType="VarChar(1000)")] - public string LoopRemarks - { - get - { - return this._LoopRemarks; - } - set - { - if ((this._LoopRemarks != value)) - { - this.OnLoopRemarksChanging(value); - this.SendPropertyChanging(); - this._LoopRemarks = value; - this.SendPropertyChanged("LoopRemarks"); - this.OnLoopRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSteam", DbType="Int")] - public System.Nullable IsSteam - { - get - { - return this._IsSteam; - } - set - { - if ((this._IsSteam != value)) - { - this.OnIsSteamChanging(value); - this.SendPropertyChanging(); - this._IsSteam = value; - this.SendPropertyChanged("IsSteam"); - this.OnIsSteamChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteamSituation", DbType="VarChar(1000)")] - public string SteamSituation - { - get - { - return this._SteamSituation; - } - set - { - if ((this._SteamSituation != value)) - { - this.OnSteamSituationChanging(value); - this.SendPropertyChanging(); - this._SteamSituation = value; - this.SendPropertyChanged("SteamSituation"); - this.OnSteamSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteamRemarks", DbType="VarChar(1000)")] - public string SteamRemarks - { - get - { - return this._SteamRemarks; - } - set - { - if ((this._SteamRemarks != value)) - { - this.OnSteamRemarksChanging(value); - this.SendPropertyChanging(); - this._SteamRemarks = value; - this.SendPropertyChanged("SteamRemarks"); - this.OnSteamRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAirCompression", DbType="Int")] - public System.Nullable IsAirCompression - { - get - { - return this._IsAirCompression; - } - set - { - if ((this._IsAirCompression != value)) - { - this.OnIsAirCompressionChanging(value); - this.SendPropertyChanging(); - this._IsAirCompression = value; - this.SendPropertyChanged("IsAirCompression"); - this.OnIsAirCompressionChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AirCompressionSituation", DbType="VarChar(1000)")] - public string AirCompressionSituation - { - get - { - return this._AirCompressionSituation; - } - set - { - if ((this._AirCompressionSituation != value)) - { - this.OnAirCompressionSituationChanging(value); - this.SendPropertyChanging(); - this._AirCompressionSituation = value; - this.SendPropertyChanged("AirCompressionSituation"); - this.OnAirCompressionSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AirCompressionRemarks", DbType="VarChar(1000)")] - public string AirCompressionRemarks - { - get - { - return this._AirCompressionRemarks; - } - set - { - if ((this._AirCompressionRemarks != value)) - { - this.OnAirCompressionRemarksChanging(value); - this.SendPropertyChanging(); - this._AirCompressionRemarks = value; - this.SendPropertyChanged("AirCompressionRemarks"); - this.OnAirCompressionRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCompoundAmmonia", DbType="Int")] - public System.Nullable IsCompoundAmmonia - { - get - { - return this._IsCompoundAmmonia; - } - set - { - if ((this._IsCompoundAmmonia != value)) - { - this.OnIsCompoundAmmoniaChanging(value); - this.SendPropertyChanging(); - this._IsCompoundAmmonia = value; - this.SendPropertyChanged("IsCompoundAmmonia"); - this.OnIsCompoundAmmoniaChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompoundAmmoniaSituation", DbType="VarChar(1000)")] - public string CompoundAmmoniaSituation - { - get - { - return this._CompoundAmmoniaSituation; - } - set - { - if ((this._CompoundAmmoniaSituation != value)) - { - this.OnCompoundAmmoniaSituationChanging(value); - this.SendPropertyChanging(); - this._CompoundAmmoniaSituation = value; - this.SendPropertyChanged("CompoundAmmoniaSituation"); - this.OnCompoundAmmoniaSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompoundAmmoniaRemarks", DbType="VarChar(1000)")] - public string CompoundAmmoniaRemarks - { - get - { - return this._CompoundAmmoniaRemarks; - } - set - { - if ((this._CompoundAmmoniaRemarks != value)) - { - this.OnCompoundAmmoniaRemarksChanging(value); - this.SendPropertyChanging(); - this._CompoundAmmoniaRemarks = value; - this.SendPropertyChanged("CompoundAmmoniaRemarks"); - this.OnCompoundAmmoniaRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUrea", DbType="Int")] - public System.Nullable IsUrea - { - get - { - return this._IsUrea; - } - set - { - if ((this._IsUrea != value)) - { - this.OnIsUreaChanging(value); - this.SendPropertyChanging(); - this._IsUrea = value; - this.SendPropertyChanged("IsUrea"); - this.OnIsUreaChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UreaSituation", DbType="VarChar(1000)")] - public string UreaSituation - { - get - { - return this._UreaSituation; - } - set - { - if ((this._UreaSituation != value)) - { - this.OnUreaSituationChanging(value); - this.SendPropertyChanging(); - this._UreaSituation = value; - this.SendPropertyChanged("UreaSituation"); - this.OnUreaSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UreaRemarks", DbType="VarChar(1000)")] - public string UreaRemarks - { - get - { - return this._UreaRemarks; - } - set - { - if ((this._UreaRemarks != value)) - { - this.OnUreaRemarksChanging(value); - this.SendPropertyChanging(); - this._UreaRemarks = value; - this.SendPropertyChanged("UreaRemarks"); - this.OnUreaRemarksChanged(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); } } } @@ -316580,42 +315857,264 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")] - public string OperationReason + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser { get { - return this._OperationReason; + return this._AddUser; } set { - if ((this._OperationReason != value)) + if ((this._AddUser != value)) { - this.OnOperationReasonChanging(value); + this.OnAddUserChanging(value); this.SendPropertyChanging(); - this._OperationReason = value; - this.SendPropertyChanged("OperationReason"); - this.OnOperationReasonChanged(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationHandle", DbType="VarChar(1000)")] - public string OperationHandle + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime { get { - return this._OperationHandle; + return this._AddTime; } set { - if ((this._OperationHandle != value)) + if ((this._AddTime != value)) { - this.OnOperationHandleChanging(value); + this.OnAddTimeChanging(value); this.SendPropertyChanging(); - this._OperationHandle = value; - this.SendPropertyChanged("OperationHandle"); - this.OnOperationHandleChanged(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + 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.Running_Maintenance")] + public partial class Running_Maintenance : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MaintenanceId; + + private string _RunningId; + + private string _ProjectId; + + private string _InstallationId; + + private string _ProcessesId; + + private string _SystemId; + + private string _MaintenanceReason; + + private string _MaintenanceHandle; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMaintenanceIdChanging(string value); + partial void OnMaintenanceIdChanged(); + partial void OnRunningIdChanging(string value); + partial void OnRunningIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnProcessesIdChanging(string value); + partial void OnProcessesIdChanged(); + partial void OnSystemIdChanging(string value); + partial void OnSystemIdChanged(); + partial void OnMaintenanceReasonChanging(string value); + partial void OnMaintenanceReasonChanged(); + partial void OnMaintenanceHandleChanging(string value); + partial void OnMaintenanceHandleChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Running_Maintenance() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaintenanceId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MaintenanceId + { + get + { + return this._MaintenanceId; + } + set + { + if ((this._MaintenanceId != value)) + { + this.OnMaintenanceIdChanging(value); + this.SendPropertyChanging(); + this._MaintenanceId = value; + this.SendPropertyChanged("MaintenanceId"); + this.OnMaintenanceIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")] + public string RunningId + { + get + { + return this._RunningId; + } + set + { + if ((this._RunningId != value)) + { + this.OnRunningIdChanging(value); + this.SendPropertyChanging(); + this._RunningId = value; + this.SendPropertyChanged("RunningId"); + this.OnRunningIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] + public string ProcessesId + { + get + { + return this._ProcessesId; + } + set + { + if ((this._ProcessesId != value)) + { + this.OnProcessesIdChanging(value); + this.SendPropertyChanging(); + this._ProcessesId = value; + this.SendPropertyChanged("ProcessesId"); + this.OnProcessesIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] + public string SystemId + { + get + { + return this._SystemId; + } + set + { + if ((this._SystemId != value)) + { + this.OnSystemIdChanging(value); + this.SendPropertyChanging(); + this._SystemId = value; + this.SendPropertyChanged("SystemId"); + this.OnSystemIdChanged(); } } } @@ -316741,6 +316240,308 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Running_Operation")] + public partial class Running_Operation : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _OperationId; + + private string _RunningId; + + private string _ProjectId; + + private string _InstallationId; + + private string _ProcessesId; + + private string _SystemId; + + private string _OperationReason; + + private string _OperationHandle; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnOperationIdChanging(string value); + partial void OnOperationIdChanged(); + partial void OnRunningIdChanging(string value); + partial void OnRunningIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnProcessesIdChanging(string value); + partial void OnProcessesIdChanged(); + partial void OnSystemIdChanging(string value); + partial void OnSystemIdChanged(); + partial void OnOperationReasonChanging(string value); + partial void OnOperationReasonChanged(); + partial void OnOperationHandleChanging(string value); + partial void OnOperationHandleChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Running_Operation() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string OperationId + { + get + { + return this._OperationId; + } + set + { + if ((this._OperationId != value)) + { + this.OnOperationIdChanging(value); + this.SendPropertyChanging(); + this._OperationId = value; + this.SendPropertyChanged("OperationId"); + this.OnOperationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")] + public string RunningId + { + get + { + return this._RunningId; + } + set + { + if ((this._RunningId != value)) + { + this.OnRunningIdChanging(value); + this.SendPropertyChanging(); + this._RunningId = value; + this.SendPropertyChanged("RunningId"); + this.OnRunningIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] + public string ProcessesId + { + get + { + return this._ProcessesId; + } + set + { + if ((this._ProcessesId != value)) + { + this.OnProcessesIdChanging(value); + this.SendPropertyChanging(); + this._ProcessesId = value; + this.SendPropertyChanged("ProcessesId"); + this.OnProcessesIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] + public string SystemId + { + get + { + return this._SystemId; + } + set + { + if ((this._SystemId != value)) + { + this.OnSystemIdChanging(value); + this.SendPropertyChanging(); + this._SystemId = value; + this.SendPropertyChanged("SystemId"); + this.OnSystemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")] + public string OperationReason + { + get + { + return this._OperationReason; + } + set + { + if ((this._OperationReason != value)) + { + this.OnOperationReasonChanging(value); + this.SendPropertyChanging(); + this._OperationReason = value; + this.SendPropertyChanged("OperationReason"); + this.OnOperationReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationHandle", DbType="VarChar(1000)")] + public string OperationHandle + { + get + { + return this._OperationHandle; + } + set + { + if ((this._OperationHandle != value)) + { + this.OnOperationHandleChanging(value); + this.SendPropertyChanging(); + this._OperationHandle = value; + this.SendPropertyChanged("OperationHandle"); + this.OnOperationHandleChanged(); + } + } + } + + [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="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + 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.SafetyData_SafetyData")] public partial class SafetyData_SafetyData : INotifyPropertyChanging, INotifyPropertyChanged { @@ -349828,6 +349629,8 @@ namespace Model private EntitySet _Doc_DocManage; + private EntitySet _Doc_DocManageApprove; + private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -350542,6 +350345,7 @@ 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)); @@ -352933,6 +352737,19 @@ 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 { @@ -357425,6 +357242,18 @@ 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(); From d88d55a7c285ceace4135d29059acd339c0e11af Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 22 Apr 2024 11:24:10 +0800 Subject: [PATCH 11/11] =?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 --- SGGL/Model/Model.cs | 2935 ++++++++++++++++++++----------------------- 1 file changed, 1382 insertions(+), 1553 deletions(-) diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 489e660d..c8570287 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1457,9 +1457,6 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); - partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); - partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); - partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2018,9 +2015,6 @@ 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); @@ -2057,6 +2051,12 @@ namespace Model partial void InsertRunning_LogManagement(Running_LogManagement instance); partial void UpdateRunning_LogManagement(Running_LogManagement instance); partial void DeleteRunning_LogManagement(Running_LogManagement instance); + partial void InsertRunning_Maintenance(Running_Maintenance instance); + partial void UpdateRunning_Maintenance(Running_Maintenance instance); + partial void DeleteRunning_Maintenance(Running_Maintenance instance); + partial void InsertRunning_Operation(Running_Operation instance); + partial void UpdateRunning_Operation(Running_Operation instance); + partial void DeleteRunning_Operation(Running_Operation instance); partial void InsertSafetyData_SafetyData(SafetyData_SafetyData instance); partial void UpdateSafetyData_SafetyData(SafetyData_SafetyData instance); partial void DeleteSafetyData_SafetyData(SafetyData_SafetyData instance); @@ -6499,14 +6499,6 @@ namespace Model } } - public System.Data.Linq.Table Manager_Month_ComplianceObligations - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -7995,14 +7987,6 @@ namespace Model } } - public System.Data.Linq.Table Report_CQMS_ProblemHandle - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Report_CqmsTarget { get @@ -8099,6 +8083,22 @@ namespace Model } } + public System.Data.Linq.Table Running_Maintenance + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table Running_Operation + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table SafetyData_SafetyData { get @@ -21552,6 +21552,8 @@ namespace Model private string _CodeRule; + private EntitySet _Doc_DocManage; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21568,6 +21570,7 @@ namespace Model public Base_DocType() { + this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21651,6 +21654,19 @@ 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; @@ -21670,6 +21686,18 @@ 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")] @@ -97526,10 +97554,10 @@ namespace Model private string _AuditMan; - private string _Measure; - private string _Problem; + private string _Measure; + private string _RemarkCode; private EntityRef _Sys_User; @@ -97578,10 +97606,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); - partial void OnMeasureChanging(string value); - partial void OnMeasureChanged(); partial void OnProblemChanging(string value); partial void OnProblemChanged(); + partial void OnMeasureChanging(string value); + partial void OnMeasureChanged(); partial void OnRemarkCodeChanging(string value); partial void OnRemarkCodeChanged(); #endregion @@ -97951,27 +97979,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] - public string Measure - { - get - { - return this._Measure; - } - set - { - if ((this._Measure != value)) - { - this.OnMeasureChanging(value); - this.SendPropertyChanging(); - this._Measure = value; - this.SendPropertyChanged("Measure"); - this.OnMeasureChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")] public string Problem { get @@ -97991,6 +97999,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")] + public string Measure + { + get + { + return this._Measure; + } + set + { + if ((this._Measure != value)) + { + this.OnMeasureChanging(value); + this.SendPropertyChanging(); + this._Measure = value; + this.SendPropertyChanged("Measure"); + this.OnMeasureChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarkCode", DbType="NVarChar(50)")] public string RemarkCode { @@ -120205,6 +120233,8 @@ namespace Model private EntityRef _Base_CNProfessional; + private EntityRef _Base_DocType; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -120256,6 +120286,7 @@ 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); @@ -120334,6 +120365,10 @@ 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; @@ -120653,6 +120688,40 @@ 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 { @@ -120823,6 +120892,8 @@ namespace Model private EntityRef _Doc_DocManage; + private EntityRef _Sys_User; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -120846,6 +120917,7 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); + this._Sys_User = default(EntityRef); OnCreated(); } @@ -120893,7 +120965,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] public string ApproveMan { get @@ -120904,6 +120976,10 @@ 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; @@ -121027,6 +121103,40 @@ 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; @@ -234790,229 +234900,6 @@ 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 { @@ -241212,8 +241099,6 @@ namespace Model private EntitySet _Manager_Month_CheckC; - private EntitySet _Manager_Month_ComplianceObligations; - private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -241486,7 +241371,6 @@ 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)); @@ -243667,19 +243551,6 @@ 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 { @@ -244261,18 +244132,6 @@ 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(); @@ -272617,7 +272476,7 @@ namespace Model private System.Nullable _ProblemType; - private string _QuestionTechnologyId; + private string _SubInspectId; private string _TermItemId; @@ -272631,20 +272490,18 @@ 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); @@ -272661,8 +272518,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnQuestionTechnologyIdChanging(string value); - partial void OnQuestionTechnologyIdChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -272675,20 +272532,18 @@ 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() @@ -272816,22 +272671,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] - public string QuestionTechnologyId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId { get { - return this._QuestionTechnologyId; + return this._SubInspectId; } set { - if ((this._QuestionTechnologyId != value)) + if ((this._SubInspectId != value)) { - this.OnQuestionTechnologyIdChanging(value); + this.OnSubInspectIdChanging(value); this.SendPropertyChanging(); - this._QuestionTechnologyId = value; - this.SendPropertyChanged("QuestionTechnologyId"); - this.OnQuestionTechnologyIdChanged(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); } } } @@ -272956,6 +272811,26 @@ 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 { @@ -272976,6 +272851,26 @@ 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 { @@ -273036,66 +272931,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="_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; @@ -273137,14 +272972,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); @@ -273163,14 +272998,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() @@ -273318,6 +273153,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(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -273378,26 +273233,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(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -274330,7 +274165,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -274453,12 +274288,6 @@ namespace Model private string _InspectResult; - private System.Nullable _InspectTime; - - private string _AddUser; - - private System.Nullable _AddTime; - private string _Subcontractor; private string _Contractor; @@ -274467,12 +274296,6 @@ namespace Model private string _Owner; - private System.Nullable _IsUnifyWanderAbout; - - private System.Nullable _UnifyWanderAboutData; - - private string _UnifyWanderAboutOpinion; - private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -274483,7 +274306,9 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WanderIsComplete; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; private System.Nullable _SubcontractorAllPassData; @@ -274493,25 +274318,35 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderCompleteData; + private System.Nullable _WanderIsComplete; - private System.Nullable _WorkPackType; + private System.Nullable _WanderCompleteData; private System.Nullable _IsSiteImplement; - private System.Nullable _InspectIsClose; - - private System.Nullable _InspectCloseData; - - private string _InspectIsCloseUser; - - private string _PropertyTechnologyId; - - private System.Nullable _RecordUploadData; + private string _SiteImplementUser; private System.Nullable _SiteImplementConfirmData; - private string _SiteImplementUser; + private System.Nullable _RecordUploadData; + + private System.Nullable _InspectIsClose; + + private string _InspectIsCloseUser; + + private System.Nullable _InspectCloseData; + + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; #region 可扩展性方法定义 partial void OnLoaded(); @@ -274533,12 +274368,6 @@ 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); @@ -274547,12 +274376,6 @@ 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); @@ -274563,8 +274386,10 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -274573,26 +274398,36 @@ 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 OnInspectIsCloseChanging(System.Nullable value); - partial void OnInspectIsCloseChanged(); - partial void OnInspectCloseDataChanging(System.Nullable value); - partial void OnInspectCloseDataChanged(); - 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(); + 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(); #endregion public PreRun_SubInspectTerm() @@ -274760,66 +274595,6 @@ 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 { @@ -274900,66 +274675,6 @@ 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 { @@ -275060,22 +274775,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType { get { - return this._WanderIsComplete; + return this._WorkPackType; } set { - if ((this._WanderIsComplete != value)) + if ((this._WorkPackType != value)) { - this.OnWanderIsCompleteChanging(value); + this.OnWorkPackTypeChanging(value); this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); + 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(); } } } @@ -275160,6 +274895,26 @@ 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 { @@ -275180,26 +274935,6 @@ 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 { @@ -275220,102 +274955,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] - public System.Nullable InspectIsClose + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] + public string SiteImplementUser { get { - return this._InspectIsClose; + return this._SiteImplementUser; } set { - if ((this._InspectIsClose != value)) + if ((this._SiteImplementUser != value)) { - this.OnInspectIsCloseChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._InspectIsClose = value; - this.SendPropertyChanged("InspectIsClose"); - this.OnInspectIsCloseChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] - public System.Nullable InspectCloseData - { - get - { - return this._InspectCloseData; - } - set - { - if ((this._InspectCloseData != value)) - { - this.OnInspectCloseDataChanging(value); - this.SendPropertyChanging(); - this._InspectCloseData = value; - this.SendPropertyChanged("InspectCloseData"); - this.OnInspectCloseDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(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="_PropertyTechnologyId", DbType="NVarChar(500)")] - 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(); - } - } - } - - [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(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -275340,22 +274995,202 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] - public string SiteImplementUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._SiteImplementUser; + return this._RecordUploadData; } set { - if ((this._SiteImplementUser != value)) + if ((this._RecordUploadData != value)) { - this.OnSiteImplementUserChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] + public System.Nullable InspectIsClose + { + get + { + return this._InspectIsClose; + } + set + { + if ((this._InspectIsClose != value)) + { + this.OnInspectIsCloseChanging(value); + this.SendPropertyChanging(); + this._InspectIsClose = value; + this.SendPropertyChanged("InspectIsClose"); + this.OnInspectIsCloseChanged(); + } + } + } + + [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 + { + get + { + return this._InspectCloseData; + } + set + { + if ((this._InspectCloseData != value)) + { + this.OnInspectCloseDataChanging(value); + this.SendPropertyChanging(); + this._InspectCloseData = value; + this.SendPropertyChanged("InspectCloseData"); + this.OnInspectCloseDataChanged(); + } + } + } + + [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="_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(); } } } @@ -275423,6 +275258,22 @@ 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; @@ -275435,22 +275286,6 @@ 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); @@ -275491,6 +275326,22 @@ 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); @@ -275503,22 +275354,6 @@ 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() @@ -275886,6 +275721,166 @@ 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 { @@ -275906,7 +275901,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string PropertyTechnologyId { get @@ -276006,166 +276001,6 @@ 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; @@ -277167,6 +277002,8 @@ namespace Model private string _RestrictCondition; + private System.Nullable _ResponsibilityProposeSatate; + private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -277177,9 +277014,11 @@ namespace Model private System.Nullable _OwnerConfirm; + private System.Nullable _ProposeConfirmData; + private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeConfirmData; + private System.Nullable _ProposeHandleData; private System.Nullable _GeneraConfirmData; @@ -277195,10 +277034,6 @@ namespace Model private System.Nullable _Sort; - private System.Nullable _ResponsibilityProposeSatate; - - private System.Nullable _ProposeHandleData; - private string _FourDecisionCode; #region 可扩展性方法定义 @@ -277235,6 +277070,8 @@ 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); @@ -277245,10 +277082,12 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnResponsibilityConfirmDataChanging(System.Nullable value); - partial void OnResponsibilityConfirmDataChanged(); 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 OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -277263,10 +277102,6 @@ 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 @@ -277576,6 +277411,26 @@ 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 { @@ -277676,6 +277531,26 @@ 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 { @@ -277696,22 +277571,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData { get { - return this._ProposeConfirmData; + return this._ProposeHandleData; } set { - if ((this._ProposeConfirmData != value)) + if ((this._ProposeHandleData != value)) { - this.OnProposeConfirmDataChanging(value); + this.OnProposeHandleDataChanging(value); this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); } } } @@ -277856,46 +277731,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="_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 { @@ -278608,7 +278443,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -313493,164 +313328,6 @@ 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 { @@ -315963,52 +315640,12 @@ namespace Model private System.Nullable _EndData; - private System.Nullable _IsDesalinated; + private string _Situation; - private string _DesalinatedSituation; - - private string _DesalinatedRemarks; - - private System.Nullable _IsLoop; - - private string _LoopSituation; - - private string _LoopRemarks; - - private System.Nullable _IsSteam; - - private string _SteamSituation; - - private string _SteamRemarks; - - private System.Nullable _IsAirCompression; - - private string _AirCompressionSituation; - - private string _AirCompressionRemarks; - - private System.Nullable _IsCompoundAmmonia; - - private string _CompoundAmmoniaSituation; - - private string _CompoundAmmoniaRemarks; - - private System.Nullable _IsUrea; - - private string _UreaSituation; - - private string _UreaRemarks; + private string _Remarks; private string _HandoverCare; - private string _OperationReason; - - private string _OperationHandle; - - private string _MaintenanceReason; - - private string _MaintenanceHandle; - private string _AddUser; private System.Nullable _AddTime; @@ -316041,52 +315678,12 @@ namespace Model partial void OnStartDataChanged(); partial void OnEndDataChanging(System.Nullable value); partial void OnEndDataChanged(); - partial void OnIsDesalinatedChanging(System.Nullable value); - partial void OnIsDesalinatedChanged(); - partial void OnDesalinatedSituationChanging(string value); - partial void OnDesalinatedSituationChanged(); - partial void OnDesalinatedRemarksChanging(string value); - partial void OnDesalinatedRemarksChanged(); - partial void OnIsLoopChanging(System.Nullable value); - partial void OnIsLoopChanged(); - partial void OnLoopSituationChanging(string value); - partial void OnLoopSituationChanged(); - partial void OnLoopRemarksChanging(string value); - partial void OnLoopRemarksChanged(); - partial void OnIsSteamChanging(System.Nullable value); - partial void OnIsSteamChanged(); - partial void OnSteamSituationChanging(string value); - partial void OnSteamSituationChanged(); - partial void OnSteamRemarksChanging(string value); - partial void OnSteamRemarksChanged(); - partial void OnIsAirCompressionChanging(System.Nullable value); - partial void OnIsAirCompressionChanged(); - partial void OnAirCompressionSituationChanging(string value); - partial void OnAirCompressionSituationChanged(); - partial void OnAirCompressionRemarksChanging(string value); - partial void OnAirCompressionRemarksChanged(); - partial void OnIsCompoundAmmoniaChanging(System.Nullable value); - partial void OnIsCompoundAmmoniaChanged(); - partial void OnCompoundAmmoniaSituationChanging(string value); - partial void OnCompoundAmmoniaSituationChanged(); - partial void OnCompoundAmmoniaRemarksChanging(string value); - partial void OnCompoundAmmoniaRemarksChanged(); - partial void OnIsUreaChanging(System.Nullable value); - partial void OnIsUreaChanged(); - partial void OnUreaSituationChanging(string value); - partial void OnUreaSituationChanged(); - partial void OnUreaRemarksChanging(string value); - partial void OnUreaRemarksChanged(); + partial void OnSituationChanging(string value); + partial void OnSituationChanged(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); partial void OnHandoverCareChanging(string value); partial void OnHandoverCareChanged(); - partial void OnOperationReasonChanging(string value); - partial void OnOperationReasonChanged(); - partial void OnOperationHandleChanging(string value); - partial void OnOperationHandleChanged(); - partial void OnMaintenanceReasonChanging(string value); - partial void OnMaintenanceReasonChanged(); - partial void OnMaintenanceHandleChanging(string value); - partial void OnMaintenanceHandleChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); @@ -316320,362 +315917,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDesalinated", DbType="Int")] - public System.Nullable IsDesalinated + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Situation", DbType="VarChar(1000)")] + public string Situation { get { - return this._IsDesalinated; + return this._Situation; } set { - if ((this._IsDesalinated != value)) + if ((this._Situation != value)) { - this.OnIsDesalinatedChanging(value); + this.OnSituationChanging(value); this.SendPropertyChanging(); - this._IsDesalinated = value; - this.SendPropertyChanged("IsDesalinated"); - this.OnIsDesalinatedChanged(); + this._Situation = value; + this.SendPropertyChanged("Situation"); + this.OnSituationChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesalinatedSituation", DbType="VarChar(1000)")] - public string DesalinatedSituation + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="VarChar(1000)")] + public string Remarks { get { - return this._DesalinatedSituation; + return this._Remarks; } set { - if ((this._DesalinatedSituation != value)) + if ((this._Remarks != value)) { - this.OnDesalinatedSituationChanging(value); + this.OnRemarksChanging(value); this.SendPropertyChanging(); - this._DesalinatedSituation = value; - this.SendPropertyChanged("DesalinatedSituation"); - this.OnDesalinatedSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesalinatedRemarks", DbType="VarChar(1000)")] - public string DesalinatedRemarks - { - get - { - return this._DesalinatedRemarks; - } - set - { - if ((this._DesalinatedRemarks != value)) - { - this.OnDesalinatedRemarksChanging(value); - this.SendPropertyChanging(); - this._DesalinatedRemarks = value; - this.SendPropertyChanged("DesalinatedRemarks"); - this.OnDesalinatedRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLoop", DbType="Int")] - public System.Nullable IsLoop - { - get - { - return this._IsLoop; - } - set - { - if ((this._IsLoop != value)) - { - this.OnIsLoopChanging(value); - this.SendPropertyChanging(); - this._IsLoop = value; - this.SendPropertyChanged("IsLoop"); - this.OnIsLoopChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopSituation", DbType="VarChar(1000)")] - public string LoopSituation - { - get - { - return this._LoopSituation; - } - set - { - if ((this._LoopSituation != value)) - { - this.OnLoopSituationChanging(value); - this.SendPropertyChanging(); - this._LoopSituation = value; - this.SendPropertyChanged("LoopSituation"); - this.OnLoopSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopRemarks", DbType="VarChar(1000)")] - public string LoopRemarks - { - get - { - return this._LoopRemarks; - } - set - { - if ((this._LoopRemarks != value)) - { - this.OnLoopRemarksChanging(value); - this.SendPropertyChanging(); - this._LoopRemarks = value; - this.SendPropertyChanged("LoopRemarks"); - this.OnLoopRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSteam", DbType="Int")] - public System.Nullable IsSteam - { - get - { - return this._IsSteam; - } - set - { - if ((this._IsSteam != value)) - { - this.OnIsSteamChanging(value); - this.SendPropertyChanging(); - this._IsSteam = value; - this.SendPropertyChanged("IsSteam"); - this.OnIsSteamChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteamSituation", DbType="VarChar(1000)")] - public string SteamSituation - { - get - { - return this._SteamSituation; - } - set - { - if ((this._SteamSituation != value)) - { - this.OnSteamSituationChanging(value); - this.SendPropertyChanging(); - this._SteamSituation = value; - this.SendPropertyChanged("SteamSituation"); - this.OnSteamSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteamRemarks", DbType="VarChar(1000)")] - public string SteamRemarks - { - get - { - return this._SteamRemarks; - } - set - { - if ((this._SteamRemarks != value)) - { - this.OnSteamRemarksChanging(value); - this.SendPropertyChanging(); - this._SteamRemarks = value; - this.SendPropertyChanged("SteamRemarks"); - this.OnSteamRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAirCompression", DbType="Int")] - public System.Nullable IsAirCompression - { - get - { - return this._IsAirCompression; - } - set - { - if ((this._IsAirCompression != value)) - { - this.OnIsAirCompressionChanging(value); - this.SendPropertyChanging(); - this._IsAirCompression = value; - this.SendPropertyChanged("IsAirCompression"); - this.OnIsAirCompressionChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AirCompressionSituation", DbType="VarChar(1000)")] - public string AirCompressionSituation - { - get - { - return this._AirCompressionSituation; - } - set - { - if ((this._AirCompressionSituation != value)) - { - this.OnAirCompressionSituationChanging(value); - this.SendPropertyChanging(); - this._AirCompressionSituation = value; - this.SendPropertyChanged("AirCompressionSituation"); - this.OnAirCompressionSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AirCompressionRemarks", DbType="VarChar(1000)")] - public string AirCompressionRemarks - { - get - { - return this._AirCompressionRemarks; - } - set - { - if ((this._AirCompressionRemarks != value)) - { - this.OnAirCompressionRemarksChanging(value); - this.SendPropertyChanging(); - this._AirCompressionRemarks = value; - this.SendPropertyChanged("AirCompressionRemarks"); - this.OnAirCompressionRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCompoundAmmonia", DbType="Int")] - public System.Nullable IsCompoundAmmonia - { - get - { - return this._IsCompoundAmmonia; - } - set - { - if ((this._IsCompoundAmmonia != value)) - { - this.OnIsCompoundAmmoniaChanging(value); - this.SendPropertyChanging(); - this._IsCompoundAmmonia = value; - this.SendPropertyChanged("IsCompoundAmmonia"); - this.OnIsCompoundAmmoniaChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompoundAmmoniaSituation", DbType="VarChar(1000)")] - public string CompoundAmmoniaSituation - { - get - { - return this._CompoundAmmoniaSituation; - } - set - { - if ((this._CompoundAmmoniaSituation != value)) - { - this.OnCompoundAmmoniaSituationChanging(value); - this.SendPropertyChanging(); - this._CompoundAmmoniaSituation = value; - this.SendPropertyChanged("CompoundAmmoniaSituation"); - this.OnCompoundAmmoniaSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompoundAmmoniaRemarks", DbType="VarChar(1000)")] - public string CompoundAmmoniaRemarks - { - get - { - return this._CompoundAmmoniaRemarks; - } - set - { - if ((this._CompoundAmmoniaRemarks != value)) - { - this.OnCompoundAmmoniaRemarksChanging(value); - this.SendPropertyChanging(); - this._CompoundAmmoniaRemarks = value; - this.SendPropertyChanged("CompoundAmmoniaRemarks"); - this.OnCompoundAmmoniaRemarksChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUrea", DbType="Int")] - public System.Nullable IsUrea - { - get - { - return this._IsUrea; - } - set - { - if ((this._IsUrea != value)) - { - this.OnIsUreaChanging(value); - this.SendPropertyChanging(); - this._IsUrea = value; - this.SendPropertyChanged("IsUrea"); - this.OnIsUreaChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UreaSituation", DbType="VarChar(1000)")] - public string UreaSituation - { - get - { - return this._UreaSituation; - } - set - { - if ((this._UreaSituation != value)) - { - this.OnUreaSituationChanging(value); - this.SendPropertyChanging(); - this._UreaSituation = value; - this.SendPropertyChanged("UreaSituation"); - this.OnUreaSituationChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UreaRemarks", DbType="VarChar(1000)")] - public string UreaRemarks - { - get - { - return this._UreaRemarks; - } - set - { - if ((this._UreaRemarks != value)) - { - this.OnUreaRemarksChanging(value); - this.SendPropertyChanging(); - this._UreaRemarks = value; - this.SendPropertyChanged("UreaRemarks"); - this.OnUreaRemarksChanged(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); } } } @@ -316700,42 +315977,264 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")] - public string OperationReason + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser { get { - return this._OperationReason; + return this._AddUser; } set { - if ((this._OperationReason != value)) + if ((this._AddUser != value)) { - this.OnOperationReasonChanging(value); + this.OnAddUserChanging(value); this.SendPropertyChanging(); - this._OperationReason = value; - this.SendPropertyChanged("OperationReason"); - this.OnOperationReasonChanged(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationHandle", DbType="VarChar(1000)")] - public string OperationHandle + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime { get { - return this._OperationHandle; + return this._AddTime; } set { - if ((this._OperationHandle != value)) + if ((this._AddTime != value)) { - this.OnOperationHandleChanging(value); + this.OnAddTimeChanging(value); this.SendPropertyChanging(); - this._OperationHandle = value; - this.SendPropertyChanged("OperationHandle"); - this.OnOperationHandleChanged(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + 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.Running_Maintenance")] + public partial class Running_Maintenance : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MaintenanceId; + + private string _RunningId; + + private string _ProjectId; + + private string _InstallationId; + + private string _ProcessesId; + + private string _SystemId; + + private string _MaintenanceReason; + + private string _MaintenanceHandle; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMaintenanceIdChanging(string value); + partial void OnMaintenanceIdChanged(); + partial void OnRunningIdChanging(string value); + partial void OnRunningIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnProcessesIdChanging(string value); + partial void OnProcessesIdChanged(); + partial void OnSystemIdChanging(string value); + partial void OnSystemIdChanged(); + partial void OnMaintenanceReasonChanging(string value); + partial void OnMaintenanceReasonChanged(); + partial void OnMaintenanceHandleChanging(string value); + partial void OnMaintenanceHandleChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Running_Maintenance() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaintenanceId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MaintenanceId + { + get + { + return this._MaintenanceId; + } + set + { + if ((this._MaintenanceId != value)) + { + this.OnMaintenanceIdChanging(value); + this.SendPropertyChanging(); + this._MaintenanceId = value; + this.SendPropertyChanged("MaintenanceId"); + this.OnMaintenanceIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")] + public string RunningId + { + get + { + return this._RunningId; + } + set + { + if ((this._RunningId != value)) + { + this.OnRunningIdChanging(value); + this.SendPropertyChanging(); + this._RunningId = value; + this.SendPropertyChanged("RunningId"); + this.OnRunningIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] + public string ProcessesId + { + get + { + return this._ProcessesId; + } + set + { + if ((this._ProcessesId != value)) + { + this.OnProcessesIdChanging(value); + this.SendPropertyChanging(); + this._ProcessesId = value; + this.SendPropertyChanged("ProcessesId"); + this.OnProcessesIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] + public string SystemId + { + get + { + return this._SystemId; + } + set + { + if ((this._SystemId != value)) + { + this.OnSystemIdChanging(value); + this.SendPropertyChanging(); + this._SystemId = value; + this.SendPropertyChanged("SystemId"); + this.OnSystemIdChanged(); } } } @@ -316861,6 +316360,308 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Running_Operation")] + public partial class Running_Operation : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _OperationId; + + private string _RunningId; + + private string _ProjectId; + + private string _InstallationId; + + private string _ProcessesId; + + private string _SystemId; + + private string _OperationReason; + + private string _OperationHandle; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnOperationIdChanging(string value); + partial void OnOperationIdChanged(); + partial void OnRunningIdChanging(string value); + partial void OnRunningIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInstallationIdChanging(string value); + partial void OnInstallationIdChanged(); + partial void OnProcessesIdChanging(string value); + partial void OnProcessesIdChanged(); + partial void OnSystemIdChanging(string value); + partial void OnSystemIdChanged(); + partial void OnOperationReasonChanging(string value); + partial void OnOperationReasonChanged(); + partial void OnOperationHandleChanging(string value); + partial void OnOperationHandleChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); + #endregion + + public Running_Operation() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string OperationId + { + get + { + return this._OperationId; + } + set + { + if ((this._OperationId != value)) + { + this.OnOperationIdChanging(value); + this.SendPropertyChanging(); + this._OperationId = value; + this.SendPropertyChanged("OperationId"); + this.OnOperationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RunningId", DbType="VarChar(50)")] + public string RunningId + { + get + { + return this._RunningId; + } + set + { + if ((this._RunningId != value)) + { + this.OnRunningIdChanging(value); + this.SendPropertyChanging(); + this._RunningId = value; + this.SendPropertyChanged("RunningId"); + this.OnRunningIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="VarChar(50)")] + public string InstallationId + { + get + { + return this._InstallationId; + } + set + { + if ((this._InstallationId != value)) + { + this.OnInstallationIdChanging(value); + this.SendPropertyChanging(); + this._InstallationId = value; + this.SendPropertyChanged("InstallationId"); + this.OnInstallationIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProcessesId", DbType="VarChar(50)")] + public string ProcessesId + { + get + { + return this._ProcessesId; + } + set + { + if ((this._ProcessesId != value)) + { + this.OnProcessesIdChanging(value); + this.SendPropertyChanging(); + this._ProcessesId = value; + this.SendPropertyChanged("ProcessesId"); + this.OnProcessesIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] + public string SystemId + { + get + { + return this._SystemId; + } + set + { + if ((this._SystemId != value)) + { + this.OnSystemIdChanging(value); + this.SendPropertyChanging(); + this._SystemId = value; + this.SendPropertyChanged("SystemId"); + this.OnSystemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationReason", DbType="VarChar(1000)")] + public string OperationReason + { + get + { + return this._OperationReason; + } + set + { + if ((this._OperationReason != value)) + { + this.OnOperationReasonChanging(value); + this.SendPropertyChanging(); + this._OperationReason = value; + this.SendPropertyChanged("OperationReason"); + this.OnOperationReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OperationHandle", DbType="VarChar(1000)")] + public string OperationHandle + { + get + { + return this._OperationHandle; + } + set + { + if ((this._OperationHandle != value)) + { + this.OnOperationHandleChanging(value); + this.SendPropertyChanging(); + this._OperationHandle = value; + this.SendPropertyChanged("OperationHandle"); + this.OnOperationHandleChanged(); + } + } + } + + [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="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + + 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.SafetyData_SafetyData")] public partial class SafetyData_SafetyData : INotifyPropertyChanging, INotifyPropertyChanged { @@ -349948,6 +349749,8 @@ namespace Model private EntitySet _Doc_DocManage; + private EntitySet _Doc_DocManageApprove; + private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -350662,6 +350465,7 @@ 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)); @@ -353053,6 +352857,19 @@ 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 { @@ -357545,6 +357362,18 @@ 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();