diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql new file mode 100644 index 0000000..a83199b --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql @@ -0,0 +1,28 @@ + +ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem] +( + @HotProessTrustId nvarchar(50), + @ProessTypes nvarchar(50)=null +) +AS +--ͨidȡίеϢ +BEGIN + + +select HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code, +STRING_AGG((case when ProessTypes='1' then 'Ԥ' + when ProessTypes='2' then '' + when ProessTypes='3' then '' + when ProessTypes='4' then 'Ӧȴ' + when ProessTypes='5' then 'ȶ' + else ''end),'+') as ProessTypes from HJGL_View_CH_HotProessTrustItem TrustItem + where HotProessTrustId=@HotProessTrustId + and (ProessTypes=@ProessTypes or @ProessTypes is null) + group by HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code + +union + +select '99999999' as Number,'¿հ' AS ISO_IsoNo,null,null,null,null + +end +go \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs index 1a9bd4f..5fe9190 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs @@ -717,7 +717,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage dt2.Columns.Add("ProessTypes"); DataView dv = tb2.DefaultView;//获取表视图 - dv.Sort = "Number ASC";//按照ID倒序排序 + dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序 tb2 = dv.ToTable();//转为表 DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); int i = 0;