diff --git a/DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql new file mode 100644 index 0000000..0288be3 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-09-25_bwj.sql @@ -0,0 +1,80 @@ + +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, + 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 + + +ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrust] +( + @HotProessTrustId nvarchar(50) +) +AS +--ͨidȡίеϢ +BEGIN + select Project.ProjectName, + Project.ProjectCode, + c.HotProessTrustCode, + Unit.UnitName, + Users.UserName, + (select top 1 STE_Code from HJGL_View_CH_HotProessTrustItem c where c.HotProessTrustId = @HotProessTrustId) as STE_Code, + (CAST(year(c.CreateDate) as varchar)+''+cast(month(c.CreateDate) as varchar)+''+cast(day(c.CreateDate) as varchar)+'') AS CreateDate, + (select top 1 ISO_DesignPress from HJGL_View_CH_HotProessTrustItem c where c.HotProessTrustId = @HotProessTrustId) as ISO_DesignPress +from dbo.HJGL_CH_HotProessTrust c +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId =c.ProjectId +LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId =c.TrustUnitId +LEFT JOIN dbo.Sys_User AS Users ON Users.UserId =c.TrstManId +where c.HotProessTrustId = @HotProessTrustId +END + + +GO + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx index a29fe2a..c8d6592 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; @@ -42,12 +42,13 @@ namespace FastReport } - + + @@ -59,9 +60,9 @@ namespace FastReport - - - + + + @@ -69,7 +70,7 @@ namespace FastReport - + @@ -92,8 +93,8 @@ namespace FastReport - - + + @@ -121,20 +122,20 @@ namespace FastReport - - + + - - - + + + - + @@ -146,14 +147,14 @@ namespace FastReport - - + + - - + + @@ -174,12 +175,12 @@ namespace FastReport - + - + @@ -191,6 +192,7 @@ namespace FastReport + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs index 9132ddb..504e6aa 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs @@ -676,6 +676,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage dt.Columns.Add("ProjectCode"); dt.Columns.Add("UnitName"); dt.Columns.Add("HotProessTrustCode"); + dt.Columns.Add("ISO_DesignPress"); //DataView dv = tb.DefaultView;//获取表视图 //dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序 @@ -688,6 +689,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage newRows["ProjectCode"] = row["ProjectCode"].ToString(); newRows["UnitName"] = row["UnitName"].ToString(); newRows["HotProessTrustCode"] = row["HotProessTrustCode"].ToString(); + newRows["ISO_DesignPress"] = row["ISO_DesignPress"].ToString(); dt.Rows.Add(newRows); } BLL.Common.FastReportService.AddFastreportTable(dt); diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index e233efb..5c46a5b 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - +