gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260127 交工资料

Browse Source
This commit is contained in:
毕文静
2026-01-27 17:22:16 +08:00
parent 2529b4c36d
commit 48567d9403
6 changed files with 366 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
+29
View File
@@ -210,6 +210,35 @@ namespace FineUIPro.Web.JGZL
var report = BLL.AnticorrosionEngineeringInspectionRecordService.GetAnticorrosionReportById(this.Grid1.SelectedRowID);
if (report != null)
{
string strSql = @"SELECT * from JGZL_AnticorrosionEngineeringInspectionRecordItem where AnticorrosionId = @anticorrosionId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@anticorrosionId", this.Grid1.SelectedRowID));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable dt = new DataTable();
dt.TableName = "Data";
dt.Columns.Add("Part");
dt.Columns.Add("MaterialName");
dt.Columns.Add("Grade");
dt.Columns.Add("Manufacturer");
dt.Columns.Add("PlanFilmThickness");
dt.Columns.Add("ActualFilmThickness");
DataRow[] rows = tb.DefaultView.ToTable().Select();
foreach (var row in rows)
{
var newRow = dt.NewRow();
newRow["Part"] = row["Part"].ToString();
newRow["MaterialName"] = row["MaterialName"].ToString();
newRow["Grade"] = row["Grade"].ToString();
newRow["Manufacturer"] = row["Manufacturer"].ToString();
newRow["PlanFilmThickness"] = row["PlanFilmThickness"].ToString();
newRow["ActualFilmThickness"] = row["ActualFilmThickness"].ToString();
dt.Rows.Add(newRow);
}
BLL.Common.FastReportService.AddFastreportTable(dt);
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("AnticorrosionCurrentStatus", report.AnticorrosionCurrentStatus);
HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs
+38 -15
View File
@@ -205,30 +205,53 @@ namespace FineUIPro.Web.JGZL
if (projectId != null)
{
if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
{
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
BLL.Common.FastReportService.ResetData();
var report = BLL.MaterialIdentificationInspectionRecordService.GetRecordById(this.Grid1.SelectedRowID);
if (report != null)
{
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
}
string strSql = @"SELECT * from JGZL_MaterialIdentificationInspectionRecord where ProjectId = @projectId order by CompileDate ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", projectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable dt = new DataTable();
dt.TableName = "Data";
dt.Columns.Add("ISO_IsoNo");
dt.Columns.Add("STE_Code");
dt.Columns.Add("Specifications");
dt.Columns.Add("PrescribedColor");
dt.Columns.Add("TubeIdentificationStatus");
dt.Columns.Add("PipeFittingName");
dt.Columns.Add("PipeFittingStatus");
dt.Columns.Add("Conclusion");
DataRow[] rows = tb.DefaultView.ToTable().Select();
foreach (var row in rows)
{
var newRow = dt.NewRow();
newRow["ISO_IsoNo"] = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(row["ISO_Id"].ToString()).ISO_IsoNo;
newRow["STE_Code"] = BLL.HJGL_MaterialService.GetSteelBySteID(row["STE_ID"].ToString()).STE_Code;
newRow["Specifications"] = row["Specifications"].ToString();
newRow["PrescribedColor"] = row["PrescribedColor"].ToString();
newRow["TubeIdentificationStatus"] = row["TubeIdentificationStatus"].ToString();
newRow["PipeFittingName"] = row["PipeFittingName"].ToString();
newRow["PipeFittingStatus"] = row["PipeFittingStatus"].ToString();
newRow["Conclusion"] = row["Conclusion"].ToString();
dt.Rows.Add(newRow);
}
BLL.Common.FastReportService.AddFastreportTable(dt);
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\管道材料材质标识检查记录.frx";
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
}
else
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
}
else
{
HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx
+1 -7
View File
@@ -56,13 +56,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtPipeFittingStatus" runat="server" Label="管件标识状态" LabelAlign="Right" LabelWidth="150px" ></f:TextBox>
<f:TextBox ID="txtBox1" runat="server" Hidden="True"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtConclusion" runat="server" Label="结果" LabelAlign="Right" LabelWidth="150px" MaxLength="500"></f:TextArea>
<f:TextArea ID="txtConclusion" runat="server" Label="结果" LabelAlign="Right" LabelWidth="150px" MaxLength="500"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx.designer.cs
Generated
-9
View File
@@ -167,15 +167,6 @@ namespace FineUIPro.Web.JGZL
/// </remarks>
protected global::FineUIPro.TextBox txtPipeFittingStatus;
/// <summary>
/// txtBox1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBox1;
/// <summary>
/// txtConclusion 控件。
/// </summary>