20260415 热处理

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

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx

@@ -36,7 +36,7 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left" Layout="VBox">
                         <Items>
-                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" EnableMultiSelect="true"
+                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" 
                                 EnableEdit="true"  AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
                             </f:DropDownList>
                         </Items>

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx.cs

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
-                //this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
 
                 //var projects = BLL.Base_ProjectService.GetProjectListByUserIdAndState(this.CurrUser.UserId, this.drpIsProjectClosed.SelectedValue);
                 //RadioButtonList1.DataTextField = "ProjectCode";
@@ -106,7 +106,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 rootProjectNode.EnableClickEvent = true;
                 rootNode.Nodes.Add(rootProjectNode);
             }
-            
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
+            {
+                this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+                BindGrid();
+            }
         }
         #endregion
 

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx

@@ -33,7 +33,7 @@
                     <f:Toolbar ID="Toolbar7" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
                             <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="300px"
-                                EnableMultiSelect="true" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
+                                EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
                             </f:DropDownList>
                         </Items>
                     </f:Toolbar>

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs

@@ -52,7 +52,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserIdAndState(this.CurrUser.UserId, this.drpIsProjectClosed.SelectedValue, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
-                //this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
                 this.tvControlItem.Nodes.Clear();
                 TreeNode rootNode = new TreeNode();
                 rootNode.Text = "项目";
@@ -64,6 +64,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 //this.InitTreeMenu();//加载树
                 //this.tvControlItem.SelectedNodeID = this.CurrUser.LoginProjectId;
                 //BindGrid();
+                this.InitTreeMenu();
             }
         }
         #endregion

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestResult.aspx

@@ -31,7 +31,7 @@
                     </f:Toolbar>
                     <f:Toolbar ID="Toolbar7" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="250px" EnableMultiSelect="true"
+                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="250px"
                                 EnableEdit="true"  AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
                             </f:DropDownList>
                         </Items>

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestResult.aspx.cs

@@ -39,7 +39,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
-                //this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
                 this.tvHardTestTrust.Nodes.Clear();
                 TreeNode rootNode = new TreeNode();
                 rootNode.Text = "项目";
@@ -48,7 +48,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 rootNode.Expanded = true;
                 rootNode.EnableClickEvent = true;
                 this.tvHardTestTrust.Nodes.Add(rootNode);
-                //this.InitTreeMenu();//加载树
+                this.InitTreeMenu();//加载树
                 //this.tvHardTestTrust.SelectedNodeID = "0";
                 //BindGrid();
                 CheckBoxField cbf1 = Grid1.FindColumn("IsOK1") as CheckBoxField;
@@ -213,6 +213,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                     rootUnitNode.Nodes.Add(tn);
                 }
             }
+           
         }
         #endregion
 

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx

@@ -28,7 +28,7 @@
                     </f:Toolbar>
                     <f:Toolbar ID="Toolbar6" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" EnableMultiSelect="true"
+                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" 
                                 EnableEdit="true"  AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
                             </f:DropDownList>
                         </Items>

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs

@@ -41,12 +41,14 @@ namespace FineUIPro.Web.HJGL.HotHardManage
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.HardTestReportId = string.Empty;
+
                 this.drpProjectId.DataTextField = "ProjectCode";
                 this.drpProjectId.DataValueField = "ProjectId";
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
-                //this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+
                 this.tvControlItem.Nodes.Clear();
                 TreeNode rootNode = new TreeNode();
                 rootNode.Text = "项目";
@@ -58,6 +60,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 //this.InitTreeMenu();//加载树
                 //this.tvControlItem.SelectedNodeID = "0";
                 //BindGrid();
+                this.InitTreeMenu();
             }
         }
         #endregion

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx

@@ -36,7 +36,7 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left" Layout="VBox">
                         <Items>
-                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" EnableMultiSelect="true"
+                            <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" 
                                 EnableEdit="true"  AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
                             </f:DropDownList>
                         </Items>

HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
-                //this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
 
                 //var projects = BLL.Base_ProjectService.GetProjectListByUserIdAndState(this.CurrUser.UserId, this.drpIsProjectClosed.SelectedValue);
                 //RadioButtonList1.DataTextField = "ProjectCode";
@@ -103,6 +103,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage
                 rootProjectNode.EnableClickEvent = true;
                 rootNode.Nodes.Add(rootProjectNode);
             }
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
+            {
+                this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+                BindGrid();
+            }
         }
         #endregion
 

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

@@ -974,7 +974,6 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                 //    return;
                 //}
                 SaveData();
-                ShowNotify("提交成功！", MessageBoxIcon.Success);
             }
             else
             {
@@ -989,6 +988,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
         /// </summary>
         private void SaveData()
         {
+            bool isEmpty = false;//是否为空
             string isoidLog = string.Empty;   //是否同一管线标记
             int i = 0;    //检验数量
             int flag = 0;    //打印标记
@@ -1033,22 +1033,120 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                     //}
                     //else
                     //{
-
+                    if (!string.IsNullOrEmpty(values.Value<string>("PointCount").ToString()))
-                    newHotProessItem.PointCount = values.Value<string>("PointCount").ToString();
+                    {
-                    newHotProessItem.RequiredT = values.Value<string>("RequiredT").ToString();
+                        newHotProessItem.PointCount = values.Value<string>("PointCount").ToString();
-                    newHotProessItem.ActualT = values.Value<string>("ActualT").ToString();
+                    }
-                    newHotProessItem.RequestTime = values.Value<string>("RequestTime").ToString();
+                    else
-                    newHotProessItem.ActualTime = values.Value<string>("ActualTime").ToString();
+                    {
-                    newHotProessItem.HotProessDate = Funs.GetNewDateTime(values.Value<string>("HotProessDate").ToString());
+                        isEmpty = true;
-                    newHotProessItem.RecordChartNo = values.Value<string>("RecordChartNo").ToString();
+                    }
-                    newHotProessItem.ThermocouplesNum = values.Value<string>("ThermocouplesNum").ToString();
+                    if (!string.IsNullOrEmpty(values.Value<string>("RequiredT").ToString()))
-                    newHotProessItem.HeatingRange = values.Value<string>("HeatingRange").ToString();
+                    {
-                    newHotProessItem.InsulationRange = values.Value<string>("InsulationRange").ToString();
+                        newHotProessItem.RequiredT = values.Value<string>("RequiredT").ToString();
-                    newHotProessItem.InsulationThickness = values.Value<string>("InsulationThickness").ToString();
+                    }
-                    newHotProessItem.HotStartDate = Funs.GetNewDateTime(values.Value<string>("HotStartDate").ToString());
+                    else
-                    newHotProessItem.HotEndDate = Funs.GetNewDateTime(values.Value<string>("HotEndDate").ToString());
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("ActualT").ToString()))
+                    {
+                        newHotProessItem.ActualT = values.Value<string>("ActualT").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("RequestTime").ToString()))
+                    {
+                        newHotProessItem.RequestTime = values.Value<string>("RequestTime").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("ActualTime").ToString()))
+                    {
+                        newHotProessItem.ActualTime = values.Value<string>("ActualTime").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("HotProessDate").ToString()))
+                    {
+                        newHotProessItem.HotProessDate = Funs.GetNewDateTime(values.Value<string>("HotProessDate").ToString());
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("RecordChartNo").ToString()))
+                    {
+                        newHotProessItem.RecordChartNo = values.Value<string>("RecordChartNo").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("ThermocouplesNum").ToString()))
+                    {
+                        newHotProessItem.ThermocouplesNum = values.Value<string>("ThermocouplesNum").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("HeatingRange").ToString()))
+                    {
+                        newHotProessItem.HeatingRange = values.Value<string>("HeatingRange").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("InsulationRange").ToString()))
+                    {
+                        newHotProessItem.InsulationRange = values.Value<string>("InsulationRange").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("InsulationThickness").ToString()))
+                    {
+                        newHotProessItem.InsulationThickness = values.Value<string>("InsulationThickness").ToString();
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("HotStartDate").ToString()))
+                    {
+                        newHotProessItem.HotStartDate = Funs.GetNewDateTime(values.Value<string>("HotStartDate").ToString());
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
+                    if (!string.IsNullOrEmpty(values.Value<string>("HotEndDate").ToString()))
+                    {
+                        newHotProessItem.HotEndDate = Funs.GetNewDateTime(values.Value<string>("HotEndDate").ToString());
+                    }
+                    else
+                    {
+                        isEmpty = true;
+                    }
                     newHotProessItem.Remark = values.Value<string>("Remark").ToString();
-                    Funs.DB.SubmitChanges();
+                    if (!isEmpty)
+                    {
+                        Funs.DB.SubmitChanges();
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("测温点编号、热处理温度℃(要求)、热处理温度℃(实际)、恒温时间h（要求）、恒温时间h（实际）、热处理日期、记录曲线图编号、热电偶数量、加热范围、保温范围、保温厚度、热处理开始时间、热处理完成时间不能为空！", MessageBoxIcon.Warning);
+                        return;
+                    }
                     //}
                 }
                 if (hotProessItem.ProessTypes.Contains("4"))   //消应力热处理需要进行硬度委托
@@ -1270,6 +1368,10 @@ namespace FineUIPro.Web.HJGL.HotProessManage
             //    oldHardTestReport2.TestCount = i;
             //    BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReport(oldHardTestReport2);
             //}
+            if (!isEmpty)
+            {
+                ShowNotify("提交成功！", MessageBoxIcon.Success);
+            }
         }
 
         /// <summary>

HJGL_DS/FineUIPro.Web/Web.config

@@ -67,7 +67,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1">
+    <compilation debug="true" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?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>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />