1

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
+
+

HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx

@@ -114,7 +114,7 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="热处理委托" EnableCollapse="true"
                         runat="server" BoxFlex="1" DataKeyNames="HotProessTrustItemId" AllowCellEditing="true"
                         AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HotProessTrustItemId"
-                        AllowSorting="true" SortField="ISO_IsoNo,JOT_JointNo" SortDirection="ASC" OnSort="Grid1_Sort"
+                        AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort"
                         AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                         EnableTextSelection="True" AutoScroll="true">
                         <Toolbars>

HJGL_DS/Model/Model.cs

@@ -59872,6 +59872,16 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private string _Sort1;
+		
+		private System.Nullable<int> _Sort2;
+		
+		private string _Sort3;
+		
+		private System.Nullable<int> _Sort4;
+		
+		private System.Nullable<int> _Sort5;
+		
 		private string _WME_Code;
 		
 		private string _WED_Code;
@@ -59880,6 +59890,8 @@ namespace Model
 		
 		private System.Nullable<bool> _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<int> 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<int> 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<int> 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")]