diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-04_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-04_bwj.sql
new file mode 100644
index 0000000..2597e84
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-09-04_bwj.sql
@@ -0,0 +1,26 @@
+
+ALTER view [dbo].[View_PrintJointInfo]
+as
+select joint.JOT_ID,
+joint.ProjectId,
+joint.ISO_ID,
+unit.UnitName,
+installation.InstallationName,
+iso.ISO_IsoNo,
+joint.JOT_JointNo,
+joint.JOT_JointDesc,
+Steel.STE_Code,
+joint.QRCodeAttachUrl,
+welder.WED_Code,
+report.JOT_WeldDate,
+joint.IS_Proess
+from HJGL_PW_JointInfo as joint
+left join HJGL_PW_IsoInfo as iso on iso.ISO_ID = joint.ISO_ID
+left join Project_Installation as installation on installation.InstallationId = joint.InstallationId
+left join Base_Unit as unit on unit.UnitId = iso.BSU_ID
+LEFT JOIN HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
+left join HJGL_BS_Welder as welder on welder.WED_ID = joint.JOT_CellWelder
+left join HJGL_BO_WeldReportMain as report on report.DReportID = joint.DReportID
+GO
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印 - 副本.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印 - 副本.frx
new file mode 100644
index 0000000..741fb45
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印 - 副本.frx
@@ -0,0 +1,156 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ /**
+ private void Table3_ManualBuild(object sender, EventArgs e)
+ {
+ // get the data source by its name
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+ Tabel_Data.PrintRow(0);
+ // each PrintRow call must be followed by either PrintColumn or PrintColumns call
+ // to print cells on the row
+ Tabel_Data.PrintColumns();
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Tabel_Data.PrintRow(0);
+ Tabel_Data.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+
+
+ // print the last table row - it is a footer
+ //Tabel_Data.PrintRow(2);
+ //Table3.PrintColumns();
+ }
+
+
+
+ private void Table4_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Table1");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+ Table4.PrintRow(0);
+ // each PrintRow call must be followed by either PrintColumn or PrintColumns call
+ // to print cells on the row
+ Table4.PrintColumns();
+
+ // now enumerate the data source and print the table body
+
+ // print the table body
+ Table4.PrintRow(1);
+ Table4.PrintColumns();
+ Table4.PrintRow(2);
+ Table4.PrintColumns();
+ Table4.PrintRow(3);
+ Table4.PrintColumns();
+ Table4.PrintRow(4);
+ Table4.PrintColumns();
+ Table4.PrintRow(5);
+ Table4.PrintColumns();
+ Table4.PrintRow(6);
+ Table4.PrintColumns();
+ // go next data source row
+ rowData.Next();
+
+ }
+
+ private void Table5_ManualBuild(object sender, EventArgs e)
+ {
+ Table5.PrintRow(0);
+ Table5.PrintColumns();
+ Table5.PrintRow(1);
+ Table5.PrintColumns();
+ }
+ **/
+
+
+
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印.frx
index 741fb45..7019b26 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊口打印.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -95,11 +95,26 @@ namespace FastReport
+
+ private void Child1_BeforePrint(object sender, EventArgs e)
+ {
+ //读取当前行IS_Proess字段值
+ var proessVal = Report.GetColumnValue("Table1.IS_Proess");
+ //条件，proessVal=1显示，否则隐藏整个Band
+ if(proessVal.ToString() == "1")
+ {
+ Child1.Visible = true;
+ }
+ else
+ {
+ Child1.Visible = false;
+ }
+ }
}
}
-
+
@@ -108,6 +123,9 @@ namespace FastReport
+
+
+
@@ -115,42 +133,63 @@ namespace FastReport
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
-
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
index 65cb2a1..b0ef20c 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
@@ -1609,6 +1609,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
dt.Columns.Add("JOT_JointDesc");
dt.Columns.Add("STE_Code");
dt.Columns.Add("QRCodeAttachUrl");
+ dt.Columns.Add("WED_Code");
+ dt.Columns.Add("JOT_WeldDate");
+ dt.Columns.Add("IS_Proess");
DataView dv = tb.DefaultView;//获取表视图
dv.Sort = "JOT_JointNo ASC";//按照ID排序
@@ -1624,6 +1627,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
newRow["JOT_JointDesc"] = row["JOT_JointDesc"].ToString();
newRow["STE_Code"] = row["STE_Code"].ToString();
newRow["QRCodeAttachUrl"] = Funs.RootPath + row["QRCodeAttachUrl"].ToString();
+ newRow["WED_Code"] = row["WED_Code"].ToString();
+ string wedDate = string.Format("{0:yyyy.MM.dd}", row["JOT_WeldDate"]);
+ newRow["JOT_WeldDate"] = wedDate;
+ newRow["IS_Proess"] = row["IS_Proess"].ToString();
dt.Rows.Add(newRow);
}
BLL.Common.FastReportService.AddFastreportTable(dt);