20260418 热处理

DataBase/版本日志/HJGLDB_DS_2026-04-18_bwj.sql

@@ -0,0 +1,89 @@
+alter table HJGL_HotProessItem add PostHeatingDate datetime
+go
+
+
+ALTER PROC [dbo].[HJGL_sp_HeatTreatmentEstimateRecord]
+          @projectId NVARCHAR(50) = NULL,
+		  @type NVARCHAR(50) = NULL
+AS
+/*管线综合分析*/
+SELECT 
+	isoinfo.ProjectId
+	,isoinfo.ISO_ID
+	,isoinfo.ISO_IsoNo
+	,ndtRate.NDTR_Name   --对接焊缝检测比例
+	,ISNULL(total_jot.total_jot,0) AS total_jot --焊口总数量
+	,ISNULL(total_bw1jot.total_bw1jot,0) AS total_bw1jot --对接焊口数量
+	,ISNULL(total_hotjot.total_hotjot ,0) AS total_hotjot --预计热处理焊口数量
+	,ISNULL(total_OKhotjot.total_OKhotjot ,0) AS total_OKhotjot --热处理合格焊口数量
+	,ISNULL(total_Trusthotjot.total_Trusthotjot ,0) AS total_Trusthotjot --已委托热处理焊口数量
+	,ISNULL(total_Inputhotjot.total_Inputhotjot ,0) AS total_Inputhotjot --已录入热处理焊口数量
+	,ISNULL(total_hotjot.total_hotjot ,0)-ISNULL(total_OKhotjot.total_OKhotjot ,0) AS total_NotOKhotjot --热处理未合格焊口数量
+	,CEILING(ISNULL(total_bw1jot.total_bw1jot,0)*ndtRate.NDTR_Rate/100.00) AS maybe_bw1jot
+	--,CASE WHEN
+	--CAST(total_jot.total_jot AS DECIMAL(9,2))*ndtRate.NDTR_Rate/100>CAST((ISNULL(total_jot.total_jot,0)*ndtRate.NDTR_Rate/100) AS INT)
+	--  THEN CAST((ISNULL(total_jot.total_jot,0)*ndtRate.NDTR_Rate/100) AS INT)+1
+	--ELSE CAST((ISNULL(total_jot.total_jot,0)*ndtRate.NDTR_Rate/100) AS INT) END
+	-- AS maybe_bw1jot    --预计检测接头数量比例	
+	,ISNULL(postHeating_jot.postHeating_jot,0) AS postHeating_jot --后热焊口数量
+FROM HJGL_PW_IsoInfo AS isoinfo
+    --对接焊缝检测比例
+    LEFT JOIN HJGL_BS_WeldControl AS weldControl ON weldControl.ISC_ID=isoinfo.ISC_ID AND weldControl.ExecStandardId=isoinfo.ISO_Executive
+	LEFT JOIN HJGL_BS_NDTRate AS ndtRate ON ndtRate.NDTR_ID=weldControl.Joty_Rate
+	----焊口总数量
+	LEFT JOIN (SELECT COUNT(*) AS total_jot
+					,HJGL_PW_JointInfo.ISO_ID  		
+				 FROM HJGL_PW_JointInfo 
+				 GROUP BY HJGL_PW_JointInfo.ISO_ID) AS total_jot ON total_jot.ISO_ID =isoinfo.ISO_ID 
+	----对接焊口数量 
+	LEFT JOIN (SELECT COUNT(*) AS total_bw1jot
+						,jointinfo.ISO_ID 				
+				 FROM HJGL_PW_JointInfo AS jointinfo
+				 WHERE  jointinfo.JOTY_ID='1e2704c8-b088-4389-9adf-9d89ceffe85b'
+				 GROUP BY jointinfo.ISO_ID) AS total_bw1jot ON total_bw1jot.ISO_ID =isoinfo.ISO_ID 				 
+    --预计热处理焊口数量
+	LEFT JOIN (SELECT COUNT(*) AS total_hotjot
+						,jointinfo.ISO_ID  				
+				 FROM HJGL_PW_JointInfo AS jointinfo
+				 WHERE  jointinfo.IS_Proess='1' and jointinfo.ProessTypes like '%'+@type+'%'
+				 GROUP BY jointinfo.ISO_ID) AS total_hotjot ON total_hotjot.ISO_ID =isoinfo.ISO_ID 	
+	--热处理合格焊口数量
+	LEFT JOIN (SELECT COUNT(*) AS total_OKhotjot
+						,jointinfo.ISO_ID  				
+				 FROM HJGL_PW_JointInfo AS jointinfo
+				 WHERE  jointinfo.IS_Proess='1' and jointinfo.ProessTypes like '%'+@type+'%'
+				 and ((select count(*) from HJGL_CH_HotProessResult r where r.JOT_ID=jointinfo.JOT_ID and r.ProessTypes=@type and r.IsOK=1)>0 or (select count(*) from HJGL_CH_HardTestResult r where r.JOT_ID=jointinfo.JOT_ID and r.IsOK=1)>0)
+				 GROUP BY jointinfo.ISO_ID) AS total_OKhotjot ON total_OKhotjot.ISO_ID =isoinfo.ISO_ID 	
+	--已委托热处理焊口数量
+	LEFT JOIN (SELECT COUNT(*) AS total_Trusthotjot
+						,jointinfo.ISO_ID  				
+				 FROM HJGL_PW_JointInfo AS jointinfo
+				 WHERE  jointinfo.IS_Proess='1' and jointinfo.ProessTypes like '%'+@type+'%'
+				 and (select count(*) from HJGL_CH_HotProessTrustItem r where r.JOT_ID=jointinfo.JOT_ID and r.ProessTypes=@type)>0
+				 GROUP BY jointinfo.ISO_ID) AS total_Trusthotjot ON total_Trusthotjot.ISO_ID =isoinfo.ISO_ID 	
+	--已录入热处理焊口数量
+	--LEFT JOIN (SELECT COUNT(*) AS total_Inputhotjot
+	--					,jointinfo.ISO_ID  				
+	--			 FROM HJGL_PW_JointInfo AS jointinfo
+	--			 WHERE  jointinfo.IS_Proess='1' and jointinfo.ProessTypes like '%'+@type+'%'
+	--			 and (select count(*) from HJGL_HotProessItem r where r.JOT_ID=jointinfo.JOT_ID and r.ProessTypes=@type and r.RecordChartNo is not null and r.RecordChartNo!='')>0
+	--			 GROUP BY jointinfo.ISO_ID) AS total_Inputhotjot ON total_Inputhotjot.ISO_ID =isoinfo.ISO_ID 	
+	LEFT JOIN (SELECT COUNT(*) AS total_Inputhotjot
+						,jointinfo.ISO_ID  				
+				 FROM HJGL_HotProessItem AS r
+				 left join HJGL_PW_JointInfo jointinfo on jointinfo.JOT_ID = r.JOT_ID
+				 WHERE r.ProessTypes=@type --and r.RecordChartNo is not null and r.RecordChartNo!=''
+				 GROUP BY jointinfo.ISO_ID) AS total_Inputhotjot ON total_Inputhotjot.ISO_ID =isoinfo.ISO_ID 
+
+	LEFT JOIN (SELECT COUNT(*) AS postHeating_jot
+						,jointinfo.ISO_ID  				
+				 FROM HJGL_HotProessItem AS r
+				 left join HJGL_PW_JointInfo jointinfo on jointinfo.JOT_ID = r.JOT_ID
+				 WHERE r.ProessTypes=@type and r.PostHeatingDate is not null
+				 GROUP BY jointinfo.ISO_ID) AS postHeating_jot ON postHeating_jot.ISO_ID =isoinfo.ISO_ID 
+	
+WHERE (isoinfo.ProjectId = @projectId OR @projectId IS NULL)
+ORDER BY isoinfo.ISO_IsoNo
+
+
+GO

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>

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

@@ -159,6 +159,14 @@
                                 SortField="JOT_JointDesc" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
                                 Width="80px">
                             </f:RenderField>
+                            <f:RenderField HeaderText="后热日期" ColumnID="PostHeatingDate" DataField="PostHeatingDate"
+                                SortField="PostHeatingDate" HeaderTextAlign="Center" TextAlign="Left" Width="100px"
+                                RendererArgument="yyyy-MM-dd" FieldType="Date" Renderer="Date">
+                                <Editor>
+                                    <f:DatePicker ID="txtPostHeatingDate" runat="server" DateFormatString="yyyy-MM-dd">
+                                    </f:DatePicker>
+                                </Editor>
+                            </f:RenderField>
                             <f:RenderField HeaderText="测温点编号" ColumnID="PointCount" DataField="PointCount" SortField="PointCount"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="60px">
                                 <Editor>

HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs

@@ -137,7 +137,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
  left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
    WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))  
  AS HardnessReportNo,
-                                  HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
+                                  HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark,HotProessItem.PostHeatingDate
                             FROM dbo.HJGL_HotProessItem AS HotProessItem
                             LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = HotProessItem.JOT_ID
                             LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID
@@ -199,7 +199,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
  left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
    WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))  
  AS HardnessReportNo,
-                                 HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
+                                 HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark,HotProessItem.PostHeatingDate
                            FROM dbo.HJGL_HotProessItem AS HotProessItem
                                 LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = HotProessItem.JOT_ID
                                 LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID
@@ -238,7 +238,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(Grid1, tb1);
             Grid1.RecordCount = tb.Rows.Count;
-            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -989,7 +989,8 @@ namespace FineUIPro.Web.HJGL.HotProessManage
         /// </summary>
         private void SaveData()
         {
-            bool isEmpty = false;//是否为空
+            bool isEmptyPostHeatingDate = false;//后热日期是否为空
+            bool isEmpty = false;//热处理数据是否为空
             string isoidLog = string.Empty;   //是否同一管线标记
             int i = 0;    //检验数量
             int flag = 0;    //打印标记
@@ -1139,13 +1140,21 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                         isEmpty = true;
                     }
                     newHotProessItem.Remark = values.Value<string>("Remark").ToString();
-                    if (!isEmpty)
+                    if (!string.IsNullOrEmpty(values.Value<string>("PostHeatingDate").ToString()))
+                    {
+                        newHotProessItem.PostHeatingDate = Funs.GetNewDateTime(values.Value<string>("PostHeatingDate").ToString());
+                    }
+                    else
+                    {
+                        isEmptyPostHeatingDate = true;
+                    }
+                    if (!isEmpty || !isEmptyPostHeatingDate)
                     {
                         Funs.DB.SubmitChanges();
                     }
                     else
                     {
-                        Alert.ShowInTop("测温点编号、热处理温度℃(要求)、热处理温度℃(实际)、恒温时间h（要求）、恒温时间h（实际）、热处理日期、记录曲线图编号、热电偶数量、加热范围、保温范围、保温厚度、热处理开始时间、热处理完成时间不能为空！", MessageBoxIcon.Warning);
+                        Alert.ShowInTop("后热日期或测温点编号、热处理温度℃(要求)、热处理温度℃(实际)、恒温时间h（要求）、恒温时间h（实际）、热处理日期、记录曲线图编号、热电偶数量、加热范围、保温范围、保温厚度、热处理开始时间、热处理完成时间不能为空！", MessageBoxIcon.Warning);
                         return;
                     }
                     //}
@@ -1369,7 +1378,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
             //    oldHardTestReport2.TestCount = i;
             //    BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReport(oldHardTestReport2);
             //}
-            if (!isEmpty)
+            if (!isEmpty || !isEmptyPostHeatingDate)
             {
                 ShowNotify("提交成功！", MessageBoxIcon.Success);
             }

HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.HotProessManage {
+namespace FineUIPro.Web.HJGL.HotProessManage
+{
 
 
-    public partial class HotProessManageEdit {
+    public partial class HotProessManageEdit
+    {
 
         /// <summary>
         /// Head1 控件。
@@ -309,6 +311,15 @@ namespace FineUIPro.Web.HJGL.HotProessManage {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label8;
 
+        /// <summary>
+        /// txtPostHeatingDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPostHeatingDate;
+
         /// <summary>
         /// nbPointCount 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEditImport.aspx.cs

@@ -80,6 +80,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
 
         protected void btnAudit_Click(object sender, EventArgs e)
         {
+            bool isEmptyPostHeatingDate = false;
             string message = string.Empty;
             errorInfos = string.Empty;
             try
@@ -178,47 +179,78 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                         {
                             errorInfos += (i + 2) + "行, [施工号、管线号和焊口号] 不能为空|";
                         }
-
+                        if(ds.Tables[0].Rows[i]["后热日期"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["后热日期"].ToString()))
+                        {
+                            try
+                            {
+                                DateTime date = Convert.ToDateTime(ds.Tables[0].Rows[i]["后热日期"].ToString());
+                                isEmptyPostHeatingDate = true;
+                            }
+                            catch (Exception)
+                            {
+                                errorInfos += (i + 2) + "行, [热处理开始时间] 必须为日期型|";
+                            }
+                        }
+                        else
+                        {
+                            isEmptyPostHeatingDate = false;
+                            errorInfos += (i + 2) + "行, [后热日期]或热处理数据，不能为空|";
+                        }
                         if (ds.Tables[0].Rows[i]["测温点编号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["测温点编号"].ToString()))
                         {
 
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [测温点编号] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["热处理温度℃(要求)"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理温度℃(要求)"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [热处理温度℃(要求)] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["热处理温度℃(实际)"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理温度℃(实际)"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [热处理温度℃(实际)] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["恒温时间h（要求）"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["恒温时间h（要求）"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [恒温时间h（要求）] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["恒温时间h（实际）"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["恒温时间h（实际）"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [恒温时间h（实际）] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["热处理日期"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理日期"].ToString()))
                         {
@@ -232,49 +264,67 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                             }
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [热处理日期] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["记录曲线图编号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["记录曲线图编号"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [记录曲线图编号] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["热电偶数量/个"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热电偶数量/个"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [热电偶数量/个] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["加热范围/mm"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["加热范围/mm"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [加热范围/mm] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["保温范围/mm"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["保温范围/mm"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [保温范围/mm] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["保温厚度/mm"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["保温厚度/mm"].ToString()))
                         {
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [保温厚度/mm] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["热处理开始时间"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理开始时间"].ToString()))
                         {
@@ -289,9 +339,12 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                             }
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [热处理开始时间] 不能为空|";
                             }
+                        }
 
                         if (ds.Tables[0].Rows[i]["热处理完成时间"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["热处理完成时间"].ToString()))
                         {
@@ -306,9 +359,12 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                             }
                         }
                         else
+                        {
+                            if (isEmptyPostHeatingDate == false)
                             {
                                 errorInfos += (i + 2) + "行, [热处理完成时间] 不能为空|";
                             }
+                        }
                         #endregion
                     }
                     if (!string.IsNullOrEmpty(errorInfos))
@@ -334,6 +390,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                     }
                     else
                     {
+                        isEmptyPostHeatingDate = false;
                         errorInfos = string.Empty;
                         ShowNotify("数据审核成功！请点击导入数据！", MessageBoxIcon.Success);
                     }
@@ -447,6 +504,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                                 newItem.HotProessTrustId = item.HotProessTrustId;
                                 newItem.ProessTypes = item.ProessTypes;
                                 newItem.SortIndex = item.SortIndex;
+                                newItem.PostHeatingDate = Funs.GetNewDateTime(ds.Tables[0].Rows[i]["后热日期"].ToString());
                                 newItem.PointCount = ds.Tables[0].Rows[i]["测温点编号"].ToString();
                                 newItem.RequiredT = ds.Tables[0].Rows[i]["热处理温度℃(要求)"].ToString();
                                 newItem.ActualT = ds.Tables[0].Rows[i]["热处理温度℃(实际)"].ToString();
@@ -545,19 +603,19 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                         int a = anchor.Row1;
                         int b = anchor.Col1;
                         string jotId = dic[a];
-                        if (b == 16)
+                        if (b == 17)
                         {
                             jotId += "1";
                         }
-                        else if (b == 17)
+                        else if (b == 18)
                         {
                             jotId += "2";
                         }
-                        else if (b == 18)
+                        else if (b == 19)
                         {
                             jotId += "3";
                         }
-                        else if (b == 19)
+                        else if (b == 20)
                         {
                             jotId += "4";
                         }

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs

@@ -1346,19 +1346,43 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                 }
                                 else
                                 {
-                                    if (!string.IsNullOrEmpty(joint.STE_ID))
-                                    {
-                                        //材质有延迟裂纹倾向，热处理合格未满24小时提醒
                                     var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
-                                        if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
+                                    if (material.IsCracking == true)
                                     {
-                                            EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
+                                        var hotProessItem = (from x in Funs.DB.HJGL_HotProessItem where x.JOT_ID == joint.JOT_ID select x).FirstOrDefault();
-                                        }
+                                        if (hotProessItem != null)
-                                    }
+                                        {
+                                            if (hotProessItem.PostHeatingDate.HasValue || (!string.IsNullOrEmpty(hotProessItem.PointCount)
+                                                && !string.IsNullOrEmpty(hotProessItem.RequiredT) && !string.IsNullOrEmpty(hotProessItem.ActualT)
+                                                && !string.IsNullOrEmpty(hotProessItem.RequestTime) && !string.IsNullOrEmpty(hotProessItem.ActualTime)
+                                                && hotProessItem.HotProessDate.HasValue && !string.IsNullOrEmpty(hotProessItem.RecordChartNo)
+                                                && !string.IsNullOrEmpty(hotProessItem.ThermocouplesNum) && !string.IsNullOrEmpty(hotProessItem.HeatingRange)
+                                                && !string.IsNullOrEmpty(hotProessItem.InsulationRange) && !string.IsNullOrEmpty(hotProessItem.InsulationThickness)
+                                                && hotProessItem.HotStartDate.HasValue && hotProessItem.HotEndDate.HasValue))
+                                            {
+
+                                            }
+                                            else
+                                            {
+                                                EventArg = EventArg + "焊口" + joint.JOT_JointNo + "后热日期未填写或热处理数据未录入，请录入数据后进行委托,";
+                                            }
+                                        }
+                                    }
+
+                                    //if (!string.IsNullOrEmpty(joint.STE_ID))
+                                    //{
+                                    //    //材质有延迟裂纹倾向，热处理合格未满24小时提醒
+                                    //    var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
+                                    //    if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
+                                    //    {
+                                    //        EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
+                                    //    }
+                                    //}
                                 }
                             }
                         }
                     }
+                    
                     if (EventArg != string.Empty)
                     {
                         EventArg = EventArg.Substring(0, EventArg.Length - 1);
@@ -1539,16 +1563,39 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                 }
                                 else
                                 {
-                                    if (!string.IsNullOrEmpty(joint.STE_ID))
-                                    {
-                                        //材质有延迟裂纹倾向，热处理合格未满24小时提醒
                                     var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
-                                        if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
+                                    if (material.IsCracking == true)
                                     {
-                                            EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
+                                        var hotProessItem = (from x in Funs.DB.HJGL_HotProessItem where x.JOT_ID == joint.JOT_ID select x).FirstOrDefault();
+                                        if (hotProessItem != null)
+                                        {
+                                            if (hotProessItem.PostHeatingDate.HasValue || (!string.IsNullOrEmpty(hotProessItem.PointCount)
+                                                && !string.IsNullOrEmpty(hotProessItem.RequiredT) && !string.IsNullOrEmpty(hotProessItem.ActualT)
+                                                && !string.IsNullOrEmpty(hotProessItem.RequestTime) && !string.IsNullOrEmpty(hotProessItem.ActualTime)
+                                                && hotProessItem.HotProessDate.HasValue && !string.IsNullOrEmpty(hotProessItem.RecordChartNo)
+                                                && !string.IsNullOrEmpty(hotProessItem.ThermocouplesNum) && !string.IsNullOrEmpty(hotProessItem.HeatingRange)
+                                                && !string.IsNullOrEmpty(hotProessItem.InsulationRange) && !string.IsNullOrEmpty(hotProessItem.InsulationThickness)
+                                                && hotProessItem.HotStartDate.HasValue && hotProessItem.HotEndDate.HasValue))
+                                            {
+
+                                            }
+                                            else
+                                            {
+                                                EventArg = EventArg + "焊口" + joint.JOT_JointNo + "后热日期未填写或热处理数据未录入，请录入数据后进行委托,";
                                             }
                                         }
                                     }
+                                    //if (!string.IsNullOrEmpty(joint.STE_ID))
+                                    //{
+                                    //    //材质有延迟裂纹倾向，热处理合格未满24小时提醒
+                                    //    var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
+                                    //    if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
+                                    //    {
+                                    //        EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
+                                    //    }
+                                    //}
+
+                                }
                             }
                         }
                     }

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx

@@ -77,22 +77,25 @@
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">                               
                             </f:RenderField>
                             <f:RenderField HeaderText="焊口总数量" ColumnID="total_jot" DataField="total_jot" SortField="total_jot"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="130px">                               
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px">                               
                             </f:RenderField>
                             <f:RenderField HeaderText="对接焊口数量" ColumnID="total_bw1jot" DataField="total_bw1jot" SortField="total_bw1jot"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="140px">
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="130px">
                             </f:RenderField>  
                             <f:RenderField HeaderText="热处理焊口总数量" ColumnID="total_hotjot" DataField="total_hotjot" SortField="total_hotjot"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
                             </f:RenderField>  
                             <f:RenderField HeaderText="已委托热处理焊口数量" ColumnID="total_Trusthotjot" DataField="total_Trusthotjot" SortField="total_Trusthotjot"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="160px">
+                            </f:RenderField>
+                            <f:RenderField HeaderText="后热焊口数量" ColumnID="postHeating_jot" DataField="postHeating_jot" SortField="postHeating_jot"
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px">
                             </f:RenderField>
                             <f:RenderField HeaderText="已录入热处理焊口数量" ColumnID="total_Inputhotjot" DataField="total_Inputhotjot" SortField="total_Inputhotjot"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="160px">
                             </f:RenderField> 
                             <f:RenderField HeaderText="热处理合格焊口数量" ColumnID="total_OKhotjot" DataField="total_OKhotjot" SortField="total_OKhotjot"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="160px">
                             </f:RenderField>  
                             <f:RenderField HeaderText="热处理尚未合格焊口数量" ColumnID="total_NotOKhotjot" DataField="total_NotOKhotjot" SortField="total_NotOKhotjot"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs

@@ -52,6 +52,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 int total_Trusthotjot = 0;
                 int total_Inputhotjot = 0;
                 int total_NotOKhotjot = 0;
+                int postHeating_jot = 0;
                 //int maybe_bw1jot = 0;
                 foreach (DataRow row in tb.Rows)
                 {
@@ -63,6 +64,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                     total_Trusthotjot += Convert.ToInt32(row["total_Trusthotjot"]);
                     total_Inputhotjot += Convert.ToInt32(row["total_Inputhotjot"]);
                     total_NotOKhotjot += Convert.ToInt32(row["total_NotOKhotjot"]);
+                    postHeating_jot += Convert.ToInt32(row["postHeating_jot"]);
                 }
 
                 JObject summary = new JObject();
@@ -75,7 +77,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 summary.Add("total_Trusthotjot", total_Trusthotjot);
                 summary.Add("total_Inputhotjot", total_Inputhotjot);
                 summary.Add("total_NotOKhotjot", total_NotOKhotjot);
-                //summary.Add("maybe_bw1jot", maybe_bw1jot);
+                summary.Add("postHeating_jot", postHeating_jot);
 
                 Grid1.SummaryData = summary;
             }
@@ -233,6 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_hotjot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString());
+            sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("postHeating_jot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Inputhotjot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_OKhotjot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_NotOKhotjot").ToString());

HJGL_DS/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx

@@ -19,7 +19,6 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                         <Items>
-                            <f:Label ID="lblWED_ID" runat="server" Hidden="true"></f:Label>
                             <f:TextBox ID="txtName" runat="server" Label="焊材牌号" EmptyText="输入查询条件" AutoPostBack="true"
                                 OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="Right">
                             </f:TextBox>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs

@@ -34,7 +34,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
             if (!IsPostBack)
             {
                 this.ProjectId = Request.Params["projectId"];
-                this.lblWED_ID.Text = Request.Params["wed_Id"];
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 this.drpWeldType.DataTextField = "WeldTypeName";
@@ -54,40 +53,40 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
         private void BindGrid()
         {
             string strSql = string.Empty;
-            bool isQua = false;
+            //bool isQua = false;
-            if (!string.IsNullOrEmpty(this.lblWED_ID.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.lblWED_ID.Text.Trim()))
-            {
+            //{
-                var qualifiedProject = BLL.HJGL_WelderQualifiedProjectService.GetWelderQualifiedProjectByWedId(this.lblWED_ID.Text.Trim());
+            //    var qualifiedProject = BLL.HJGL_WelderQualifiedProjectService.GetWelderQualifiedProjectByWedId(this.lblWED_ID.Text.Trim());
-                if (qualifiedProject.Count > 0)
+            //    if (qualifiedProject.Count > 0)
-                {
+            //    {
-                    //当材质类型为FeⅢ并且资质后面三个数中间的为11时可领用FeⅢ无保护气体焊丝
+            //        //当材质类型为FeⅢ并且资质后面三个数中间的为11时可领用FeⅢ无保护气体焊丝
-                    qualifiedProject = qualifiedProject.Where(e => e.MaterialType.Contains("FeⅢ") && e.QualifiedProjectCode.Contains("/11/")).ToList();
+            //        qualifiedProject = qualifiedProject.Where(e => e.MaterialType.Contains("FeⅢ") && e.QualifiedProjectCode.Contains("/11/")).ToList();
-                    if (qualifiedProject.Count > 0)
+            //        if (qualifiedProject.Count > 0)
-                    {
+            //        {
-                        isQua = true;
+            //            isQua = true;
-                    }
+            //        }
-                }
+            //    }
-            }
+            //}
 
-            if (isQua)
+            //if (isQua)
-            {
+            //{
             strSql = @"SELECT weld.WeldId, weld.WeldCode, weld.WeldName, weld.WeldSpec,weld.WeldTypeId,weld.SteelType,
                                      WeldType.WeldTypeName,WeldType.WeldUnit
                                FROM dbo.Weld_WeldInfo weld
                                LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId 
                                WHERE 1 = 1 and (weld.IsLock is null or weld.IsLock=0)
                                and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                strSql = @"SELECT weld.WeldId, weld.WeldCode, weld.WeldName, weld.WeldSpec,weld.WeldTypeId,weld.SteelType,
+            //    strSql = @"SELECT weld.WeldId, weld.WeldCode, weld.WeldName, weld.WeldSpec,weld.WeldTypeId,weld.SteelType,
-                                     WeldType.WeldTypeName,WeldType.WeldUnit
+            //                         WeldType.WeldTypeName,WeldType.WeldUnit
-                               FROM dbo.Weld_WeldInfo weld
+            //                   FROM dbo.Weld_WeldInfo weld
-                               LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId 
+            //                   LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId 
-                               WHERE 1 = 1 and (weld.IsLock is null or weld.IsLock=0)
+            //                   WHERE 1 = 1 and (weld.IsLock is null or weld.IsLock=0)
-                            and weld.SteelType != 'FeⅢ无保护气体'
+            //                and weld.SteelType != 'FeⅢ无保护气体'
-                            and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
+            //                and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
-            }
+            //}
              List<SqlParameter> listStr = new List<SqlParameter>();
             //listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             listStr.Add(new SqlParameter("@UnitStoreId", Request.Params["unitStoreId"]));

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.designer.cs

@@ -68,15 +68,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
 
-        /// <summary>
-        /// lblWED_ID 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lblWED_ID;
-
         /// <summary>
         /// txtName 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs

@@ -349,6 +349,23 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                         }
                     }
                 }
+                if (!string.IsNullOrEmpty(weld.SteelType) && weld.SteelType == "FeⅢ无保护气体")
+                {
+                    if (!string.IsNullOrEmpty(this.hdUsingMan1.Text.Trim()))
+                    {
+                        var qualifiedProject = BLL.HJGL_WelderQualifiedProjectService.GetWelderQualifiedProjectByWedId(this.hdUsingMan1.Text.Trim());
+                        if (qualifiedProject.Count > 0)
+                        {
+                            //当材质类型为FeⅢ并且资质后面三个数中间的为11时可领用FeⅢ无保护气体焊丝
+                            qualifiedProject = qualifiedProject.Where(e => e.MaterialType.Contains("FeⅢ") && e.QualifiedProjectCode.Contains("/11/")).ToList();
+                            if (qualifiedProject.Count == 0)
+                            {
+                                Alert.ShowInTop("无FeⅢ无保护气体资质，不可领用！", MessageBoxIcon.Warning);
+                                return;
+                            }
+                        }
+                    }
+                }
             }           
 
             Model.Weld_UsingPlan usingPlan = new Model.Weld_UsingPlan();
@@ -579,12 +596,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
                 return;
             }           
-            if (string.IsNullOrEmpty(this.hdUsingMan1.Text.Trim()))
+            string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, "编辑 - ");
-            {
-                Alert.ShowInTop("请选择领料人！", MessageBoxIcon.Warning);
-                return;
-            }
-            string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}&wed_Id={2}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, hdUsingMan1.Text.Trim(), "编辑 - ");
             PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
         }
 

HJGL_DS/Model/Model.cs

@@ -44079,6 +44079,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _HotEndDate;
 		
+		private System.Nullable<System.DateTime> _PostHeatingDate;
+		
 		private EntityRef<HJGL_PW_JointInfo> _HJGL_PW_JointInfo;
 		
     #region 可扩展性方法定义
@@ -44131,6 +44133,8 @@ namespace Model
     partial void OnHotStartDateChanged();
     partial void OnHotEndDateChanging(System.Nullable<System.DateTime> value);
     partial void OnHotEndDateChanged();
+    partial void OnPostHeatingDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnPostHeatingDateChanged();
     #endregion
 		
 		public HJGL_HotProessItem()
@@ -44603,6 +44607,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostHeatingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PostHeatingDate
+		{
+			get
+			{
+				return this._PostHeatingDate;
+			}
+			set
+			{
+				if ((this._PostHeatingDate != value))
+				{
+					this.OnPostHeatingDateChanging(value);
+					this.SendPropertyChanging();
+					this._PostHeatingDate = value;
+					this.SendPropertyChanged("PostHeatingDate");
+					this.OnPostHeatingDateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_HotProessItem_HJGL_PW_JointInfo", Storage="_HJGL_PW_JointInfo", ThisKey="JOT_ID", OtherKey="JOT_ID", IsForeignKey=true)]
 		public HJGL_PW_JointInfo HJGL_PW_JointInfo
 		{

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>