From c31c70a82870d6f7e35d02d661b4251b2cd87a33 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Fri, 3 Apr 2026 00:46:38 +0800
Subject: [PATCH] 1

---
 SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs  | 31 +++++++++++++------
 .../common/mainMenu_HJGL3.aspx.cs             |  9 +++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
index a2455755..3b0232d4 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
@@ -280,17 +280,28 @@ namespace FineUIPro.Web.CLGL
             }
             string planId = Grid1.SelectedRowID;
             var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
-            if (planMaster.State != (int)TwConst.State.已完成)
+            switch (planMaster.State)
             {
-                Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
-                return;
-            }
-            else
-            {
-                TwInputmasterService.RevokeGenInMasterByPlanId(planId);
-                BindGrid();
-                ShowNotify("撤销入库单成功！", MessageBoxIcon.Success);
-            }
+                case (int)TwConst.State.已审核:
+                    planMaster.State= (int)TwConst.State.待审核;
+                    planMaster.AuditMan = null;
+                    planMaster.AuditDate = null;
+                    TwInOutplanmasterService.Update(planMaster);
+                    BindGrid();
+                    ShowNotify("撤销审核成功！", MessageBoxIcon.Success);
+
+                    break;
+                case (int)TwConst.State.已完成:
+                    TwInputmasterService.RevokeGenInMasterByPlanId(planId);
+                    BindGrid();
+                    ShowNotify("撤销入库单成功！", MessageBoxIcon.Success);
+                    break; 
+
+
+                    default:
+                    Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
+                    break;
+            } 
         }
 
         protected void btnSearch_Click(object sender, EventArgs e)
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
index bcea3b54..e96b1dee 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
@@ -78,11 +78,10 @@ namespace FineUIPro.Web.common
                 {
                     // 优化：从内存字典中获取管线数量，避免数据库查询
                     int a = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId].Count : 0;
-                    decimal totalDia = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId].TotalDin ?? 0 : 0;
                     var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
-                    tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线" + "（总达因：" + totalDia.ToString() + "）";
+                    tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线" ;
                     tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
                     tn1.EnableClickEvent = true;
                     rootNode1.Nodes.Add(tn1);
@@ -94,12 +93,10 @@ namespace FineUIPro.Web.common
                 {
                     // 优化：从内存字典中获取管线数量，避免数据库查询
                     int a = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId].Count : 0;
-                    decimal totalDia = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId].TotalDin??0 : 0;
-
                     var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
-                    tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线" + "（总达因：" + totalDia.ToString() + "）";
+                    tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"  ;
                     tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
                     tn2.EnableClickEvent = true;
                     rootNode2.Nodes.Add(tn2);
@@ -260,6 +257,7 @@ JointData AS (
         j.Size,
         j.WeldingDailyId,
         j.JointAttribute,
+        j.PipelineId,
         p.PipeArea,
         p.UnitWorkId
     FROM dbo.HJGL_WeldJoint j
@@ -326,6 +324,7 @@ JointData AS (
         j.Size,
         j.WeldingDailyId,
         j.JointAttribute,
+        j.PipelineId,   
         p.PipeArea,
         p.UnitWorkId
     FROM dbo.HJGL_WeldJoint j