11

2024-05-26 22:29:27 +08:00
parent aec61bcebf
commit 7690087c95
11 changed files with 305 additions and 14 deletions
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
@@ -51,7 +51,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="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
    </httpHandlers>
-    <compilation debug="true" targetFramework="4.8">
+    <compilation debug="false" targetFramework="4.8">
      <assemblies>
        <!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
        <add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
@@ -126,6 +126,7 @@ namespace FineUIPro.Web.WelderManage
            {
                updateQue.ThicknessMax = 0;
            }
+            updateQue.IsHand=true;

            Funs.DB.SubmitChanges();
            BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId);
@@ -375,7 +375,8 @@ namespace FineUIPro.Web.WelderManage
        {
            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
            {
-                var que = from x in Funs.DB.Welder_WelderQualify where x.WelderId == this.tvControlItem.SelectedNodeID select x;
+                // 手动的不自动分析 IsHand==null
+                var que = from x in Funs.DB.Welder_WelderQualify where x.WelderId == this.tvControlItem.SelectedNodeID && x.IsHand==null select x;
                if (que.Count() > 0)
                {
                    foreach (var q in que)
@@ -982,8 +982,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                                            sch = dn.First().XXS;
                                        }
                                    }
-
-                                    d.Thickness = sch;
+                                    if (sch != null)
+                                    {
+                                        d.Thickness = sch;
+                                    }
+                                    else
+                                    {
+                                        errorInfos += (i + 2) + "行,美标壁厚[" + ansi + "]未设置值；";
+                                    }
+                                    

                                    if (dia != null && sch != null)
                                    {