From f5fb9cf5c75449d3921e235d5433afe0aab2e412 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 1 Sep 2026 19:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=84=8A=E5=8F=A3=E6=A0=87=E6=B3=A8=E5=90=8E?= =?UTF-8?q?=E7=84=8A=E5=8F=A3=E5=85=B3=E8=81=94=E7=AE=A1=E7=BA=BF=E6=9D=90?= =?UTF-8?q?=E8=B4=A8=E4=BF=A1=E6=81=AF=E7=AD=89=E8=BF=9B=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs index e647a38..fcc1e50 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs @@ -817,6 +817,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking if (iso != null) { var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID); + string steelCode = Funs.DB.HJGL_BS_Steel + .Where(x => x.STE_ID == iso.STE_ID) + .Select(x => x.STE_Code) + .FirstOrDefault(); HashSet existingJointNos = new HashSet( Funs.DB.HJGL_PW_JointInfo .Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.ISO_ID == ISO_ID) @@ -866,6 +870,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking newDataInTemp.Value1 = unit != null ? unit.UnitCode : null; newDataInTemp.Value3 = iso.ISO_IsoNo; newDataInTemp.Value4 = jointNo; + newDataInTemp.Value5 = steelCode; + newDataInTemp.Value12 = iso.Specification; + newDataInTemp.Value13 = iso.ISO_Sch.HasValue ? iso.ISO_Sch.Value.ToString() : null; + newDataInTemp.Value32 = iso.ISO_Dia.HasValue ? iso.ISO_Dia.Value.ToString() : null; newDataInTemp.Value46 = item.Value("x"); newDataInTemp.Value47 = item.Value("y"); newDataInTemp.Value48 = item.Value("x2");