From d204265b2fa4f5c99bfc8aebd2e639ca8eb072c0 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Sun, 12 Oct 2025 15:10:43 +0800 Subject: [PATCH] 1 --- DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql | 61 ++++++++++ .../HJGL/HotProessManage/HotProessTrust.aspx | 2 +- HJGL_DS/Model/Model.cs | 108 ++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql new file mode 100644 index 0000000..aebd4b3 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-10-12_gf.sql @@ -0,0 +1,61 @@ + +ALTER VIEW [dbo].[HJGL_View_CH_HotProessTrustItem] +/*ȴίϸѯб*/ +AS +SELECT TrustItem.HotProessTrustItemId, --ȴίϸid + TrustItem.HotProessTrustId, -- ȴίid + JointInfo.JOT_ID, --id + ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number, + TrustItem.TrustDate, + '' as NewJotId, + IsoInfo.ISO_IsoNo, + JointInfo.ISO_ID, + (CASE WHEN record.RepairMark IS NOT NULL THEN (JointInfo.JOT_JointNo+record.RepairMark) + ELSE JointInfo.JOT_JointNo END )+ISNULL(TrustItem.HardRepairMark,'') AS JOT_JointNo, + JointInfo.DReportID, + report.JOT_WeldDate, + TrustItem.Remark, + TrustItem.TrustItemID, + TrustItem.HardTestResultId, + TrustItem.HardRepairMark, + TrustItem.IsComplete, + CASE Result.IsOK WHEN 1 THEN '' + WHEN 0 THEN '' + ELSE '' END AS IsOKStr, + CASE Result.IsOK WHEN 1 THEN '' + WHEN 0 THEN 'δ' + ELSE '' END AS IsOKStr2, + TrustItem.ProessTypes, --ȴ + JointInfo.JOT_JointDesc, -- + JointInfo.ProjectId, + JointInfo.Sort1, + JointInfo.Sort2, + JointInfo.Sort3, + JointInfo.Sort4, + JointInfo.Sort5, + WeldMethod.WME_Code, --ӷ + --(CASE WHEN Welder1.WED_Code!=Welder2.WED_Code THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, -- + (CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN (Welder1.WED_Code+'/'+Welder2.WED_Code) ELSE Welder1.WED_Code END) AS WED_Code, -- + (CASE WHEN JointInfo.STE_ID<>JointInfo.STE_ID2 THEN Steel1.STE_Code+'/'+Steel2.STE_Code + ELSE Steel1.STE_Code END) AS STE_Code, -- + Result.IsOK, --Ƿ + cast(cast(IsoInfo.ISO_DesignPress as decimal(18,2)) as nvarchar(10))+ 'Mpa' as ISO_DesignPress --ѹ +FROM dbo.HJGL_PW_JointInfo AS JointInfo +LEFT JOIN dbo.HJGL_BS_WeldMethod WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID +LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder +LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder +LEFT JOIN dbo.HJGL_BO_WeldReportMain report ON report.DReportID = JointInfo.DReportID +LEFT JOIN dbo.HJGL_CH_HotProessTrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID +LEFT JOIN dbo.HJGL_CH_HotProessTrust AS Trust ON Trust.HotProessTrustId=TrustItem.HotProessTrustId +LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID +LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel1 ON JointInfo.STE_ID = Steel1.STE_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON JointInfo.STE_ID2 = Steel2.STE_ID +LEFT JOIN dbo.HJGL_CH_HotProessResult AS Result ON Result.HotProessTrustId=TrustItem.HotProessTrustId AND Result.JOT_ID=TrustItem.JOT_ID AND TrustItem.ProessTypes=Result.ProessTypes + + + + +GO + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx index a784650..8cb24d2 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx @@ -114,7 +114,7 @@ diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 98ecff4..a484531 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -59872,6 +59872,16 @@ namespace Model private string _ProjectId; + private string _Sort1; + + private System.Nullable _Sort2; + + private string _Sort3; + + private System.Nullable _Sort4; + + private System.Nullable _Sort5; + private string _WME_Code; private string _WED_Code; @@ -59880,6 +59890,8 @@ namespace Model private System.Nullable _IsOK; + private string _ISO_DesignPress; + public HJGL_View_CH_HotProessTrustItem() { } @@ -60220,6 +60232,86 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort1", DbType="VarChar(10)")] + public string Sort1 + { + get + { + return this._Sort1; + } + set + { + if ((this._Sort1 != value)) + { + this._Sort1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort2", DbType="Int")] + public System.Nullable Sort2 + { + get + { + return this._Sort2; + } + set + { + if ((this._Sort2 != value)) + { + this._Sort2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort3", DbType="VarChar(10)")] + public string Sort3 + { + get + { + return this._Sort3; + } + set + { + if ((this._Sort3 != value)) + { + this._Sort3 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort4", DbType="Int")] + public System.Nullable Sort4 + { + get + { + return this._Sort4; + } + set + { + if ((this._Sort4 != value)) + { + this._Sort4 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort5", DbType="Int")] + public System.Nullable Sort5 + { + get + { + return this._Sort5; + } + set + { + if ((this._Sort5 != value)) + { + this._Sort5 = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WME_Code", DbType="VarChar(20)")] public string WME_Code { @@ -60283,6 +60375,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ISO_DesignPress", DbType="NVarChar(13)")] + public string ISO_DesignPress + { + get + { + return this._ISO_DesignPress; + } + set + { + if ((this._ISO_DesignPress != value)) + { + this._ISO_DesignPress = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_View_CH_RepairItemRecord")]