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");