From 58f285e49f63926c8e6703ee79d9653dc7aa4b98 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 18 Mar 2026 10:06:28 +0800 Subject: [PATCH] =?UTF-8?q?20260318=20=E4=BA=A4=E5=B7=A5=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-03-18_bwj.sql | 4 + .../JGZL/材料质量证明文件一览表.frx | 4 +- .../File/Fastreport/JGZL/档案移交表.frx | 20 +- .../File/Fastreport/JGZL/焊丝发放记录.frx | 201 +++++++++++++++++ .../File/Fastreport/JGZL/焊条发放回收记录.frx | 184 ++++++++++++++++ .../File/Fastreport/JGZL/焊条烘烤记录.frx | 4 +- HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 16 ++ .../FineUIPro.Web/JGZL/ArchivalTransfer.aspx | 4 +- .../JGZL/ArchivalTransfer.aspx.cs | 56 +++-- .../JGZL/ArchivalTransfer.aspx.designer.cs | 54 ----- .../FineUIPro.Web/JGZL/ElectrodeRecovery.aspx | 106 +++++++++ .../JGZL/ElectrodeRecovery.aspx.cs | 205 ++++++++++++++++++ .../JGZL/ElectrodeRecovery.aspx.designer.cs | 134 ++++++++++++ .../JGZL/SteelPipeCheckRecord.aspx.cs | 12 +- .../JGZL/WeldingWireRecovery.aspx | 105 +++++++++ .../JGZL/WeldingWireRecovery.aspx.cs | 203 +++++++++++++++++ .../JGZL/WeldingWireRecovery.aspx.designer.cs | 134 ++++++++++++ 17 files changed, 1346 insertions(+), 100 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs diff --git a/DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql new file mode 100644 index 0000000..3ce578f --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-03-18_bwj.sql @@ -0,0 +1,4 @@ + +update Sys_Menu set Url='JGZL/WeldingWireRecovery.aspx' where MenuId='87D52498-9FCC-4D47-B717-4CB2CA355E31' +update Sys_Menu set Url='JGZL/ElectrodeRecovery.aspx' where MenuId='E7681A08-F21C-441B-B6BC-DF41BF2651CD' +go \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx index 6c12c78..955148b 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -63,7 +63,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx index 8e14a1f..d13dea2 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/档案移交表.frx @@ -1,17 +1,11 @@  - + - - - - - - @@ -70,21 +64,21 @@ - + - + - + - + - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx new file mode 100644 index 0000000..a79306a --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊丝发放记录.frx @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx new file mode 100644 index 0000000..6b2218b --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条发放回收记录.frx @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx index 77e25a8..b409256 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -39,7 +39,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 37d6f36..3d4dea5 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1249,6 +1249,7 @@ + @@ -1318,6 +1319,7 @@ + @@ -6633,6 +6635,13 @@ DocumentDescription.aspx + + ElectrodeRecovery.aspx + ASPXCodeBehind + + + ElectrodeRecovery.aspx + EWeldRHRecord.aspx ASPXCodeBehind @@ -7116,6 +7125,13 @@ WeldingRodBaking.aspx + + WeldingWireRecovery.aspx + ASPXCodeBehind + + + WeldingWireRecovery.aspx + WeldInspectionCheckRecord.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx index 3b368e1..35121d1 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx @@ -63,7 +63,7 @@ - + <%-- @@ -80,7 +80,7 @@ - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs index cc6bdef..3db840a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.cs @@ -123,12 +123,12 @@ namespace FineUIPro.Web.JGZL txtTransferringDepart.Text = string.Empty; txtFileName.Text = string.Empty; txtQuantity.Text = string.Empty; - txtTransferringMan.Text = string.Empty; - txtTransferringDate.Text = string.Empty; - txtReviewer.Text = string.Empty; - txtReviewDate.Text = string.Empty; - txtRecipient.Text = string.Empty; - txtReceivingDate.Text = string.Empty; + //txtTransferringMan.Text = string.Empty; + //txtTransferringDate.Text = string.Empty; + //txtReviewer.Text = string.Empty; + //txtReviewDate.Text = string.Empty; + //txtRecipient.Text = string.Empty; + //txtReceivingDate.Text = string.Empty; } private void PageData() @@ -152,12 +152,12 @@ namespace FineUIPro.Web.JGZL this.txtFileName.Text = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName + "交工技术文件"; } this.txtQuantity.Text = report.Quantity.HasValue ? report.Quantity.ToString() : "1"; - this.txtTransferringMan.Text = report.TransferringMan; - this.txtTransferringDate.Text = report.TransferringDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.TransferringDate) : ""; - this.txtReviewer.Text = report.Reviewer; - this.txtReviewDate.Text = report.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReviewDate) : ""; - this.txtRecipient.Text = report.Recipient; - this.txtReceivingDate.Text = report.ReceivingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReceivingDate) : ""; + //this.txtTransferringMan.Text = report.TransferringMan; + //this.txtTransferringDate.Text = report.TransferringDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.TransferringDate) : ""; + //this.txtReviewer.Text = report.Reviewer; + //this.txtReviewDate.Text = report.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReviewDate) : ""; + //this.txtRecipient.Text = report.Recipient; + //this.txtReceivingDate.Text = report.ReceivingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReceivingDate) : ""; } else { @@ -165,6 +165,14 @@ namespace FineUIPro.Web.JGZL this.txtProjectCode.Text = BLL.Base_ProjectService.GetProjectCode(projectId); this.txtFileName.Text = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName + "交工技术文件"; this.txtQuantity.Text = "1"; + var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId); + if (user != null) + { + if (!string.IsNullOrEmpty(user.DepartId)) + { + txtTransferringDepart.Text = BLL.Base_DepartService.GetDepart(user.DepartId).DepartName; + } + } } } } @@ -183,12 +191,12 @@ namespace FineUIPro.Web.JGZL newArchivalTransfer.TransferringDepart = this.txtTransferringDepart.Text; newArchivalTransfer.FileName = this.txtFileName.Text; newArchivalTransfer.Quantity = Funs.GetNewInt(this.txtQuantity.Text); - newArchivalTransfer.TransferringMan = this.txtTransferringMan.Text; - newArchivalTransfer.TransferringDate = Funs.GetNewDateTime(this.txtTransferringDate.Text); - newArchivalTransfer.Reviewer = this.txtReviewer.Text; - newArchivalTransfer.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); - newArchivalTransfer.Recipient = this.txtRecipient.Text; - newArchivalTransfer.ReceivingDate = Funs.GetNewDateTime(this.txtReceivingDate.Text); + //newArchivalTransfer.TransferringMan = this.txtTransferringMan.Text; + //newArchivalTransfer.TransferringDate = Funs.GetNewDateTime(this.txtTransferringDate.Text); + //newArchivalTransfer.Reviewer = this.txtReviewer.Text; + //newArchivalTransfer.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); + //newArchivalTransfer.Recipient = this.txtRecipient.Text; + //newArchivalTransfer.ReceivingDate = Funs.GetNewDateTime(this.txtReceivingDate.Text); if (!string.IsNullOrEmpty(this.ArchivalTransferId)) { newArchivalTransfer.ArchivalTransferId = this.ArchivalTransferId; @@ -232,12 +240,12 @@ namespace FineUIPro.Web.JGZL keyValuePairs.Add("TransferringDepart", this.txtTransferringDepart.Text); keyValuePairs.Add("FileName", this.txtFileName.Text); keyValuePairs.Add("Quantity", this.txtQuantity.Text); - keyValuePairs.Add("TransferringMan", this.txtTransferringMan.Text); - keyValuePairs.Add("TransferringDate", this.txtTransferringDate.Text); - keyValuePairs.Add("Reviewer", this.txtReviewer.Text); - keyValuePairs.Add("ReviewDate", this.txtReviewDate.Text); - keyValuePairs.Add("Recipient", this.txtRecipient.Text); - keyValuePairs.Add("ReceivingDate", this.txtReceivingDate.Text); + //keyValuePairs.Add("TransferringMan", this.txtTransferringMan.Text); + //keyValuePairs.Add("TransferringDate", this.txtTransferringDate.Text); + //keyValuePairs.Add("Reviewer", this.txtReviewer.Text); + //keyValuePairs.Add("ReviewDate", this.txtReviewDate.Text); + //keyValuePairs.Add("Recipient", this.txtRecipient.Text); + //keyValuePairs.Add("ReceivingDate", this.txtReceivingDate.Text); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\JGZL\\档案移交表.frx"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs index 522d431..83f1f7e 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ArchivalTransfer.aspx.designer.cs @@ -167,60 +167,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.NumberBox txtQuantity; - /// - /// txtTransferringMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTransferringMan; - - /// - /// txtTransferringDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtTransferringDate; - - /// - /// txtReviewer 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtReviewer; - - /// - /// txtReviewDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtReviewDate; - - /// - /// txtRecipient 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtRecipient; - - /// - /// txtReceivingDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtReceivingDate; - /// /// WindowPrint 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx new file mode 100644 index 0000000..f44decc --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx @@ -0,0 +1,106 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ElectrodeRecovery.aspx.cs" Inherits="FineUIPro.Web.JGZL.ElectrodeRecovery" %> + + + + + + + 焊条发放回收记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs new file mode 100644 index 0000000..2860f63 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.cs @@ -0,0 +1,205 @@ +using BLL; +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; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JGZL +{ + public partial class ElectrodeRecovery : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + // 绑定表格 + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + } + this.BindGrid(); + } + else if (GetRequestEventArgument() == "reloadGrid") + { + this.BindGrid(); + } + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT m.UsingMatId, m.ProjectId,case when project.ProjectCode is not null then project.ProjectCode else usingPlan.ProjectId end as ProjectCode, m.UsePosition, m.WeldId, m.UsingPlanId, + m.Amount,m.TwoAmount, m.UsingMan, m.UsingDate,m.StoreMan,m.Warrantybook,m.Number,m.StockInId,Weld.WeldName,StockIn.HeartNo,StockIn.Warrantybook,Weld.WeldSpec,Welder.WED_Code, + usingPlan.STE_Name,CONVERT(FLOAT,(ISNULL(m.Amount,0)+ISNULL(m.TwoAmount,0))) as TotalAmount,CONVERT(FLOAT,ISNULL(r.RecycleAmount,0)) as RecycleAmount,storeman.StoreName + FROM dbo.Weld_UsingMat m + LEFT JOIN Base_Project AS project ON project.ProjectId = m.ProjectId + LEFT JOIN dbo.Weld_UsingPlan usingPlan ON usingPlan.UsingPlanId = m.UsingPlanId + LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId + LEFT JOIN dbo.Weld_StockIn AS StockIn ON StockIn.StockInId=m.StockInId + LEFT JOIN dbo.HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingPlan.UsingManOne + LEFT JOIN dbo.Weld_RecycleMat AS r ON r.UsingMatId = m.UsingMatId + LEFT JOIN dbo.Weld_Storeman storeman ON storeman.StoremanId = m.StoreMan + LEFT JOIN dbo.Weld_WeldType weldType ON weldType.WeldTypeId = Weld.WeldTypeId + WHERE m.IsWelderConfirm=1 and m.IsStoreManConfirm=1 and weldType.WeldTypeName like '%焊条%'"; + List listStr = new List(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND m.ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND m.UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND m.UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页 排序 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + Dictionary keyValuePairs = new Dictionary(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.drpProjectId.SelectedValue); + if (project != null) + { + keyValuePairs.Add("ProjectName", project.ProjectName); + } + } + + String strSql = @"SELECT * FROM View_Report_UsingMat WHERE 1=1 "; + List listStr = new List + { + + }; + + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + strSql += " order by UsingDateMonth,UsingDateDay "; + SqlParameter[] parameter1 = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter1); + + BLL.Common.FastReportService.ResetData(); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + tb.TableName = "View_Report_UsingMat"; + BLL.Common.FastReportService.AddFastreportTable(tb); + + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + + initTemplatePath = "File\\Fastreport\\JGZL\\焊条发放回收记录.frx"; + + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs new file mode 100644 index 0000000..34e9664 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/ElectrodeRecovery.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class ElectrodeRecovery + { + + /// + /// 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; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs index 3694115..2de6b97 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs @@ -445,11 +445,17 @@ namespace FineUIPro.Web.JGZL i++; } BLL.Common.FastReportService.AddFastreportTable(dt2); + + initTemplatePath = "File\\Fastreport\\JGZL\\钢管检查验收记录.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } } - initTemplatePath = "File\\Fastreport\\JGZL\\钢管检查验收记录.frx"; - if (File.Exists(rootPath + initTemplatePath)) + else { - PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; } } else diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx new file mode 100644 index 0000000..816f708 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx @@ -0,0 +1,105 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldingWireRecovery.aspx.cs" Inherits="FineUIPro.Web.JGZL.WeldingWireRecovery" %> + + + + + + + 焊丝发放记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs new file mode 100644 index 0000000..18ce311 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.cs @@ -0,0 +1,203 @@ +using BLL; +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; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JGZL +{ + public partial class WeldingWireRecovery : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + // 绑定表格 + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + this.BindGrid(); + } + else if (GetRequestEventArgument() == "reloadGrid") + { + this.BindGrid(); + } + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT m.UsingMatId, m.ProjectId,case when project.ProjectCode is not null then project.ProjectCode else usingPlan.ProjectId end as ProjectCode, m.UsePosition, m.WeldId, m.UsingPlanId, + m.Amount,m.TwoAmount, m.UsingMan, m.UsingDate,m.StoreMan,m.Warrantybook,m.Number,m.StockInId,Weld.WeldName,StockIn.HeartNo,StockIn.Warrantybook,Weld.WeldSpec,Welder.WED_Code, + usingPlan.STE_Name,CONVERT(FLOAT,(ISNULL(m.Amount,0)+ISNULL(m.TwoAmount,0))) as TotalAmount,CONVERT(FLOAT,ISNULL(r.RecycleAmount,0)) as RecycleAmount,storeman.StoreName, + CONVERT(FLOAT,(ISNULL(m.Amount,0)+ISNULL(m.TwoAmount,0))*Weld.ConvertValue) as Weights + FROM dbo.Weld_UsingMat m + LEFT JOIN Base_Project AS project ON project.ProjectId = m.ProjectId + LEFT JOIN dbo.Weld_UsingPlan usingPlan ON usingPlan.UsingPlanId = m.UsingPlanId + LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId + LEFT JOIN dbo.Weld_StockIn AS StockIn ON StockIn.StockInId=m.StockInId + LEFT JOIN dbo.HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingPlan.UsingManOne + LEFT JOIN dbo.Weld_RecycleMat AS r ON r.UsingMatId = m.UsingMatId + LEFT JOIN dbo.Weld_Storeman storeman ON storeman.StoremanId = m.StoreMan + LEFT JOIN dbo.Weld_WeldType weldType ON weldType.WeldTypeId = Weld.WeldTypeId + WHERE m.IsWelderConfirm=1 and m.IsStoreManConfirm=1 and weldType.WeldTypeName like '%焊丝%'"; + List listStr = new List(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND m.ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND m.UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND m.UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页 排序 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + Dictionary keyValuePairs = new Dictionary(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.drpProjectId.SelectedValue); + if (project != null) + { + keyValuePairs.Add("ProjectName", project.ProjectName); + } + } + + String strSql = @"SELECT * FROM View_Report_Weld_UsingMat where 1=1 "; + List listStr = new List + { + + }; + + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + strSql += " AND ProjectId = @projectId"; + listStr.Add(new SqlParameter("@projectId", this.drpProjectId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtStartTime.Text)) + { + strSql += " AND UsingDate >= @StartDate"; + listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartTime.Text.Trim()))); + } + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + strSql += " AND UsingDate <= @EndDate"; + listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndTime.Text.Trim()))); + } + strSql += " order by UsingDateMonth,UsingDateDay "; + SqlParameter[] parameter1 = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter1); + + BLL.Common.FastReportService.ResetData(); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + tb.TableName = "View_Report_Weld_UsingMat"; + BLL.Common.FastReportService.AddFastreportTable(tb); + + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + + initTemplatePath = "File\\Fastreport\\JGZL\\焊丝发放记录.frx"; + + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs new file mode 100644 index 0000000..d0d01bb --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingWireRecovery.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class WeldingWireRecovery + { + + /// + /// 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; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +}