diff --git a/DataBase/版本日志/HJGLDB_DS_2025-08-12_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-08-12_bwj.sql new file mode 100644 index 0000000..abf2b37 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-08-12_bwj.sql @@ -0,0 +1,110 @@ + +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 --Ƿ +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_HotProessTrustItem] +( + @HotProessTrustId nvarchar(50) +) +AS +--ͨidȡίеϢ +BEGIN + select *, + ProessTypes1+ + (case when ProessTypes1<>'' and ProessTypes2<>'' then ','+ ProessTypes2 else ProessTypes2 end) + +(case when (ProessTypes1<>'' or ProessTypes2<>'') and ProessTypes3<>'' then ','+ ProessTypes3 else ProessTypes3 end) + +(case when (ProessTypes1<>'' or ProessTypes2<>'' or ProessTypes3<>'') and ProessTypes4<>'' then ','+ ProessTypes4 else ProessTypes4 end) + +(case when (ProessTypes1<>'' or ProessTypes2<>'' or ProessTypes3<>'' or ProessTypes4<>'') and ProessTypes5<>'' then ','+ ProessTypes5 else ProessTypes5 end) as ProessTypes + from + ( + select --ROW_NUMBER() OVER(ORDER BY JOT_JointNo) as Sort, + --ROW_NUMBER() OVER(ORDER BY JOT_JointNo) as Number, + c.Number, + c.HotProessTrustItemId, --ȴίϸid + c.HotProessTrustId, -- ȴίid + c.JOT_ID, --id + c.TrustDate, + c.ISO_IsoNo, + c.JOT_JointNo, + c.Remark, + ProessTypes1 =case when ProessTypes like '%1%' then 'Ԥ' + else '' end, + ProessTypes2 =case when ProessTypes like '%2%' then '' + else '' end, + ProessTypes3 =case when ProessTypes like '%3%' then '' + else '' end, + ProessTypes4 =case when ProessTypes like '%4%' then 'Ӧȴ' + else '' end, + ProessTypes5 =case when ProessTypes like '%5%' then 'ȶ' + else '' end, + c.JOT_JointDesc, -- + c.ProjectId, + c.STE_Code, -- + c.WME_Code, --ӷ + c.WED_Code -- +from dbo.HJGL_View_CH_HotProessTrustItem c +where c.HotProessTrustId = @HotProessTrustId +) as t +--order by t.ISO_IsoNo,t.JOT_JointNo + + +union + +select 99999999 as Number,null,null,null,null,'¿հ' AS ISO_IsoNo,null,null,null,null,null,null,null,null,null,null,null,null,null + +order by Number + +END +GO + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx index b6c9219..a29fe2a 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,7 +42,7 @@ namespace FastReport } - + @@ -59,14 +59,14 @@ namespace FastReport - - - + + + - - + + @@ -76,7 +76,7 @@ namespace FastReport - + @@ -84,7 +84,7 @@ namespace FastReport - + @@ -134,13 +134,13 @@ namespace FastReport - + - - + + @@ -152,17 +152,17 @@ namespace FastReport - - - + + + - - + + - + @@ -174,11 +174,11 @@ 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 c84ae16..9132ddb 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs @@ -707,7 +707,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage dt2.Columns.Add("ProessTypes"); DataView dv = tb2.DefaultView;//获取表视图 - dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序 + dv.Sort = "Number ASC";//按照ID倒序排序 tb2 = dv.ToTable();//转为表 DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); int i = 0; 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 @@ - +