diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 84b1d2e..5a61a34 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs index 4e73ecc..91ab871 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs +++ b/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(); diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 79594b6..e233efb 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index a48b337..28be9c4 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU FolderProfile true