diff --git a/DataBase/版本日志/SGGLDB_V2025-10-30-001-bwj.sql b/DataBase/版本日志/SGGLDB_V2025-10-30-001-bwj.sql new file mode 100644 index 0000000..ca5ff9f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-10-30-001-bwj.sql @@ -0,0 +1,98 @@ + +ALTER VIEW [dbo].[V_JOINTVIEW] + +AS + +SELECT jot.JOT_ID, + jot.ProjectId, + WorkArea.WorkAreaId, + WorkArea.WorkAreaCode, + IsoInfo.ISO_ISONO, + jot.JOT_BelongPipe, + jot.JOT_JointNo, + jot.JOT_Dia, + jot.JOT_Sch, + jot.JOT_FactSch, + Steel.MaterialType as MetalType, + cw.wed_code AS JOT_CellWelder, + fw.wed_code AS JOT_FloorWelder, + WeldMethod.WeldingMethodName, + NDTRate.DetectionRate, + (NDTRate.DetectionRate+'%') AS NDTR, + bService.MediumName AS SER_NAME, + WeldReportMain.JOT_WeldDate, + WeldReportMain.JOT_DailyReportNo, + trust.CH_TrustCode AS CH_TRUSTCODE1, + jot.IS_Proess, + trust.CHT_CheckDate AS CHT_CHECKDATE, + CAST(ISNULL(jot.JOT_Size,0) AS DECIMAL(19,2)) AS JOT_Size, + WeldMaterialMat.ConsumablesCode AS WMT_MatCode, + WeldMaterialMat.ConsumablesName AS WMT_Matname, + WeldMaterialSilk.ConsumablesCode AS hsCode, + WeldMaterialSilk.ConsumablesName AS hsname, + jot.JOT_JointDesc, + jot.PW_PointID, + Steel.MaterialCode as STE_Name1,--1 + (CASE WHEN jot.PW_PointID IS NULL THEN '0' ELSE '1' END) AS if_dk, + (CASE WHEN jot.IS_Proess ='1' THEN '' ELSE '' END) AS ProessName, + (CASE WHEN jot.PW_PointID IS NULL THEN '' ELSE '' END) AS if_dkName, + WorkArea.SupervisorUnitId, + jot.JOT_JointStatus, + jot.JOT_ProessDate, + HJGL_Hard_Trust.HardTrustNo HotHardCode,--Ӳίб + HJGL_Hard_Trust.HardTrustDate HotHardDate, --Ӳί + HOTTrust.HotProessTrustNo JOT_HotRpt,--ȴ + HOTTrust.ProessDate --ȴί + ,IsoInfo.UnitId + ,trust.CH_TrustType + ,trust.CH_TrustDate + ,trust.CH_TrustCode + ,TPPackage.PTP_TestPackageNo + ,jot.ISO_Type + ,jot.JOTY_ID + ,WeldType.WeldTypeCode + ,jot.JOT_Location + ,jot.JOT_PrepareTemp + ,jot.JOT_LastTemp + ,jot.JOT_Electricity + ,jot.JOT_Voltage + ,jot.JOT_CellTemp + ,jot.DetectionTypeId + ,jot.DetectionRateId + ,jot.JOT_WeldSilk + ,jot.JOT_WeldMat +FROM PW_JointInfo AS jot + LEFT JOIN PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = jot.ISO_ID + LEFT JOIN ProjectData_WorkArea AS WorkArea ON WorkArea.WorkAreaId = IsoInfo.WorkAreaId + LEFT JOIN Base_Material AS Steel ON Steel.MaterialId = jot.MaterialId + LEFT JOIN Base_WeldingMethod AS WeldMethod ON WeldMethod.WeldingMethodId = jot.WME_ID + LEFT JOIN Base_DetectionRate AS NDTRate ON NDTRate.DetectionRateId = IsoInfo.DetectionRateId + LEFT JOIN Base_TestMedium AS bService ON bService.TestMediumId = IsoInfo.TestMediumId + LEFT JOIN BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID = jot.DReportID + LEFT JOIN bs_welder AS fw ON jot.JOT_FloorWelder = fw.wed_id + LEFT JOIN bs_welder AS cw ON jot.JOT_CellWelder = cw.wed_id + LEFT JOIN Base_Consumables AS WeldMaterialMat ON WeldMaterialMat.ConsumablesId =jot.JOT_WeldMat + LEFT JOIN Base_Consumables AS WeldMaterialSilk ON WeldMaterialSilk.ConsumablesId =jot.JOT_WeldSilk + LEFT JOIN (SELECT DISTINCT JOT_ID, CH_TrustCode,CH_TrustDate ,Checks.CHT_CheckDate,CH_TrustType FROM CH_TrustItem AS TrustItem + LEFT JOIN CH_Trust AS CH_Trust ON TrustItem.CH_TrustID = CH_Trust.CH_TrustID + LEFT JOIN CH_Check AS Checks ON Checks.CH_TrustID=CH_Trust.CH_TrustID + ) AS trust ON trust.JOT_ID = jot.JOT_ID + LEFT JOIN HJGL_Hard_TrustItem ON HJGL_Hard_TrustItem.WeldJointId=jot.JOT_ID + LEFT JOIN HJGL_Hard_Trust ON HJGL_Hard_Trust.HardTrustID = HJGL_Hard_TrustItem.HardTrustID + LEFT JOIN TP_IsoList TPIso ON IsoInfo.ISO_ID = TPIso.ISO_ID + LEFT JOIN TP_TestPackage TPPackage ON TPPackage.PTP_ID = TPIso.PTP_ID + LEFT JOIN HJGL_HotProess_TrustItem AS HotTrustItem ON jot.JOT_ID=HotTrustItem.WeldJointId + LEFT JOIN HJGL_HotProess_Trust AS HOTTrust ON HOTTrust.HotProessTrustId=HotTrustItem.HotProessTrustId + LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.JOTY_ID + + + + + + + + + +GO + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工作记录.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工作记录.frx index c1bb68b..feb6711 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工作记录.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工作记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -57,7 +57,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工艺检查记录.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工艺检查记录.frx index 966b030..4160ae1 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工艺检查记录.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接工艺检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -53,84 +53,35 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + @@ -138,11 +89,11 @@ namespace FastReport - - - - - + + + + + @@ -156,88 +107,88 @@ namespace FastReport - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -260,25 +211,25 @@ namespace FastReport - - - - - - + + + + + + - - - + + + - - - + + + + + - - diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx index 5ff883e..bb55245 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -45,7 +45,7 @@ namespace FastReport } - + @@ -62,42 +62,42 @@ namespace FastReport - - - - + + + + - + - - + + - + - - + + - + - + - - + + - - + + @@ -108,11 +108,11 @@ namespace FastReport - + - + @@ -175,62 +175,62 @@ namespace FastReport - - - + + + - - - - - - + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - + @@ -247,20 +247,20 @@ namespace FastReport - - - - - + + + + + - - - - - - + + + + + + - + @@ -280,56 +280,56 @@ namespace FastReport - - - + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/设备焊接工作记录.frx b/SGGL/FineUIPro.Web/File/Fastreport/设备焊接工作记录.frx index 17f3557..583e054 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/设备焊接工作记录.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/设备焊接工作记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -56,24 +56,15 @@ namespace FastReport } - + - - - - - - - - - @@ -85,34 +76,34 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -123,12 +114,12 @@ namespace FastReport - - - - + + + + - + @@ -144,141 +135,141 @@ namespace FastReport - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -304,35 +295,35 @@ namespace FastReport - - + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs index fe4e5ff..a6206ef 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs @@ -724,14 +724,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (!string.IsNullOrEmpty(tb.Rows[i]["WED_Name2"].ToString())) WED_Name += " " + tb.Rows[i]["WED_Name1"].ToString(); tb.Rows[i]["WED_Name"] = WED_Name; - if (!string.IsNullOrEmpty(tb.Rows[i]["JOT_WeldDate"].ToString())) - { - DateTimeFormat dateTimeFormat = new DateTimeFormat("yyyy-MM-DD HH:mm:ss.000"); - DateTime dateTime = DateTime.Parse(tb.Rows[i]["JOT_WeldDate"].ToString()); + //if (!string.IsNullOrEmpty(tb.Rows[i]["JOT_WeldDate"].ToString())) + //{ + // DateTimeFormat dateTimeFormat = new DateTimeFormat("yyyy-MM-DD HH:mm:ss.000"); + // DateTime dateTime = DateTime.Parse(tb.Rows[i]["JOT_WeldDate"].ToString()); - tb.Rows[i]["JOT_WeldDate_Month"] = dateTime.Month + ""; - tb.Rows[i]["JOT_WeldDate_Day"] = dateTime.Day + ""; - } + // tb.Rows[i]["JOT_WeldDate_Month"] = dateTime.Month + ""; + // tb.Rows[i]["JOT_WeldDate_Day"] = dateTime.Day + ""; + //} if (!string.IsNullOrEmpty(tb.Rows[i]["WeldSilk"].ToString()) && !string.IsNullOrEmpty(tb.Rows[i]["WeldMat"].ToString())) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx index 2230105..7133851 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx @@ -37,7 +37,7 @@ -