1

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

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

@@ -178,8 +178,12 @@
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
             this.tvControlItem.Nodes.Add(rootNode);
-
-            var iso = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId && x.BSU_ID == this.UnitId orderby x.ISO_IsoNo select x).ToList();
+            Model.SGGLDB db = Funs.DB;
+            var iso = (from x in db.HJGL_PW_IsoInfo
+                       where x.ProjectId == this.ProjectId && x.BSU_ID == this.UnitId
+                       && (from y in db.HJGL_PW_JointInfo where y.ISO_ID == x.ISO_ID && y.DReportID == null select y).Count() > 0
+                       orderby x.ISO_IsoNo
+                       select x).ToList();
             if (!string.IsNullOrEmpty(this.txtIsono.Text))
             {
                 iso = (from x in iso where x.ISO_IsoNo.Contains(this.txtIsono.Text.Trim()) orderby x.ISO_IsoNo select x).ToList();

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>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />