From 0defba7f03b4e9abc94a42a02b498ee4865abad7 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Thu, 13 Nov 2025 17:00:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=92=8C=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=8A=A0=E4=B8=89=E4=B8=AA=E9=9B=86=E5=9B=A2=E7=9A=84=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_2025-11-13-geh.sql | 7 + .../Project_CQMSData_CQMS.aspx | 157 +++++++++++++- .../Project_CQMSData_CQMS.aspx.cs | 36 +++- .../Project_CQMSData_CQMS.aspx.designer.cs | 13 +- .../Project_HJGLData_HJGL.aspx | 53 ++++- .../Project_HJGLData_HJGL.aspx.cs | 37 +++- .../Project_HJGLData_HJGL.aspx.designer.cs | 13 +- .../Project_HSSEData_HSSE.aspx | 203 +++++++++++++++++- .../Project_HSSEData_HSSE.aspx.cs | 36 +++- .../Project_HSSEData_HSSE.aspx.designer.cs | 13 +- 10 files changed, 509 insertions(+), 59 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_2025-11-13-geh.sql diff --git a/DataBase/版本日志/SGGLDB_2025-11-13-geh.sql b/DataBase/版本日志/SGGLDB_2025-11-13-geh.sql new file mode 100644 index 0000000..901f681 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_2025-11-13-geh.sql @@ -0,0 +1,7 @@ + +--拆分前 +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'F32D79E1-7116-45F2-9964-3F6CB243C403', N'安全数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx', 80, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1'); +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'7AF59776-21CD-4B6A-A765-2F888E4AF8BD', N'质量数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx', 90, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1'); +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'8358C2EE-2B65-4001-AC09-32B6936AA3CA', N'焊接数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx', 100, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1'); +go + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx index 72a72cb..358952a 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx @@ -33,23 +33,26 @@ - - --%> + + + + - + <%-- @@ -155,7 +158,145 @@ FieldType="String" HeaderText="检验批个数" TextAlign="Left" HeaderTextAlign="Center" > - + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs index 396851f..64ef73f 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs @@ -4,7 +4,7 @@ using System.Data.SqlClient; using System.Text; using BLL; using AspNet = System.Web.UI.WebControls; - +using System.Collections.Generic; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { public partial class Project_CQMSData_CQMS : PageBase @@ -27,16 +27,32 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// private void BindGrid() { - Model.Project_CQMSData_CQMS table = new Model.Project_CQMSData_CQMS(); - table.ProjectId = this.CurrUser.ProjectId; - var tb = BLL.Project_CQMSDataService.getListData(table, Grid1); - Grid1.RecordCount = Project_CQMSDataService.count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + + string strSql = @"SELECT x.* , p.ProjectName, p.ShortName" + + @" FROM Project_CQMSData_CQMS AS x " + + @" LEFT JOIN Base_Project AS p ON x.ProjectId=p.ProjectId WHERE 1=1 "; + List listStr = new List(); + + if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim())) + { + strSql += " AND p.ProjectName LIKE @ProjectName"; + listStr.Add(new SqlParameter("@ProjectName", "%" + this.txtProjectName.Text.Trim() + "%")); + } + // strSql += @" ORDER BY x.ReportDate DESC"; + + 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 - + protected void btSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } #region GV 数据操作 /// /// 过滤表头 @@ -179,7 +195,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnNew.Hidden = false; + // this.btnNew.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -205,7 +221,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("CQMS首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; + this.Grid1.PageSize = 10000; this.BindGrid(); Response.Write(GetGridTableHtml(Grid1)); Response.End(); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs index 7db1814..b5b0bcd 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs @@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync protected global::FineUIPro.Toolbar Toolbar2; /// - /// btnNew 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNew; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; /// /// btnOut 控件。 diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx index 4374672..758d77e 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx @@ -34,23 +34,26 @@ - - --%> + + + + - + <%-- @@ -83,7 +86,41 @@ FieldType="String" HeaderText="合格片数" TextAlign="Left" HeaderTextAlign="Center" > - + --%> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs index 1ee319b..2d994d1 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs @@ -7,7 +7,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using BLL; using AspNet = System.Web.UI.WebControls; - +using System.Data; +using System.Data.SqlClient; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { public partial class Project_HJGLData_HJGL : PageBase @@ -30,16 +31,34 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// private void BindGrid() { - Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL(); - table.ProjectId = this.CurrUser.LoginProjectId; - var tb = BLL.Project_HJGLData_HJGLService.getListData(table, Grid1); - Grid1.RecordCount = Project_HJGLData_HJGLService.count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + + string strSql = @"SELECT x.* , p.ProjectName, p.ShortName" + + @" FROM Project_HJGLData_HJGL AS x " + + @" LEFT JOIN Base_Project AS p ON x.ProjectId=p.ProjectId WHERE 1=1 "; + List listStr = new List(); + + if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim())) + { + strSql += " AND p.ProjectName LIKE @ProjectName"; + listStr.Add(new SqlParameter("@ProjectName", "%" + this.txtProjectName.Text.Trim() + "%")); + } + strSql += @" ORDER BY x.ReportDate DESC"; + + 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 + protected void btSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #region GV 数据操作 /// /// 过滤表头 @@ -181,7 +200,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnNew.Hidden = false; + // this.btnNew.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -207,7 +226,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊接首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; + this.Grid1.PageSize = 10000; this.BindGrid(); Response.Write(GetGridTableHtml(Grid1)); Response.End(); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs index 2c32966..a0f629f 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs @@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync protected global::FineUIPro.Toolbar Toolbar2; /// - /// btnNew 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNew; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; /// /// btnOut 控件。 diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx index 7bd4035..e2b054e 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx @@ -34,23 +34,26 @@ - - --%> + + + + - + <%-- @@ -280,9 +283,189 @@ - - - + #1# + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs index a2fdade..52dd3d1 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs @@ -7,6 +7,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using BLL; using AspNet = System.Web.UI.WebControls; +using System.Data; +using System.Data.SqlClient; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { public partial class Project_HSSEData_HSSE :PageBase @@ -29,12 +31,25 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// private void BindGrid() { - Model.Project_HSSEData_HSSE table = new Model.Project_HSSEData_HSSE(); - table.ProjectId = this.CurrUser.LoginProjectId; - var tb = BLL.Project_HSSEData_HSSEService.GetListData(table, Grid1); - Grid1.RecordCount = Project_HSSEData_HSSEService.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + + string strSql = @"SELECT x.* , p.ProjectName, p.ShortName" + + @" FROM Project_HSSEData_HSSE AS x " + + @" LEFT JOIN Base_Project AS p ON x.ProjectId=p.ProjectId WHERE 1=1 "; + List listStr = new List(); + + if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim())) + { + strSql += " AND p.ProjectName LIKE @ProjectName"; + listStr.Add(new SqlParameter("@ProjectName", "%" + this.txtProjectName.Text.Trim() + "%")); + } + strSql += @" ORDER BY x.ReportDate DESC"; + + 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 @@ -73,6 +88,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync this.BindGrid(); } + protected void btSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + /// /// 分页显示条数下拉框 /// @@ -179,7 +199,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnNew.Hidden = false; + // this.btnNew.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -205,7 +225,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("HSSE首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; + this.Grid1.PageSize = 10000; this.BindGrid(); Response.Write(GetGridTableHtml(Grid1)); Response.End(); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs index e888089..c830834 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs @@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync protected global::FineUIPro.Toolbar Toolbar2; /// - /// btnNew 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNew; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; /// /// btnOut 控件。