From 6dd2c9128954c2ad5bde9c35199c5fb5ca9e2671 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Fri, 21 Aug 2026 15:30:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=90=E6=96=99=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=9A=90=E8=97=8F=E5=B7=B2=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E7=AE=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj          |  4 ++--
 .../HJGL/WeldingManage/WeldMatMatch.aspx         | 16 +++-------------
 .../HJGL/WeldingManage/WeldMatMatch.aspx.cs      | 15 ++++++---------
 .../WeldingManage/WeldMatMatch.aspx.designer.cs  |  9 ---------
 4 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index f9a771b8..5b440e5a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -8276,7 +8276,7 @@
     </Compile>
     <Compile Include="CLGL\InPlanMaster.aspx.cs">
       <DependentUpon>InPlanMaster.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="CLGL\InPlanMaster.aspx.designer.cs">
       <DependentUpon>InPlanMaster.aspx</DependentUpon>
@@ -17350,4 +17350,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
index cb4dd59f..dcb124c1 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
@@ -1,6 +1,5 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldMatMatch.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.WeldMatMatch" %>
-
-<%@ Register Src="~/Controls/_3DLook.ascx" TagName="_3DLook" TagPrefix="uc1" %>
+ 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -135,11 +134,7 @@
                 </f:Panel>
                 <f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
                     ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
-                    <Items>
-                        <f:Panel runat="server" ID="panelTopRegion" RegionPosition="Top" ShowBorder="true" RegionPercent="30%" IsFluid="true"   Hidden="true"
-                            Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
-                            TitleToolTip="三维模型显示" AutoScroll="true" IFrameUrl="../../CLGL/ArrivalStatistics.aspx" EnableIFrame="true">
-                        </f:Panel>
+                    <Items> 
                         <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="30%"
                             Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
                             TitleToolTip="三维模型显示" AutoScroll="true">
@@ -262,12 +257,7 @@
             IsModal="false" AutoScroll="true" BodyPadding="10px">
         </f:Window>
     </form>
-    <script type="text/javascript">
-        var panelTopRegionCD = '<%= panelTopRegion.ClientID %>';
-        function getiframWidth() {
-            return F(panelTopRegionCD).getWidth();
-
-        }
+    <script type="text/javascript"> 
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
index 338e2148..4492bc2b 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
@@ -328,17 +328,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <returns>符合材料匹配入口条件的管线列表。</returns>
         private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId)
         {
-            var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
-                                                      join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
-                                                      where y.State == (int)TwConst.State.已完成 && y.WarehouseId == drpWarehouse.SelectedValue
-                                                      select x;
+            //var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
+            //                                          join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
+            //                                          where y.State == (int)TwConst.State.已完成 && y.WarehouseId == drpWarehouse.SelectedValue
+            //                                          select x;
 
             var pipeline = (from x in Funs.DB.HJGL_Pipeline
-                            join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId
-                            join y in completeInOutPlanDetailRelationList on x.PipelineId equals y.PipelineId into temp
-                            from y in temp.DefaultIfEmpty()
-                            where y == null
-                                  && p.PTP_ID == ptpId
+                            join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId 
+                            where p.PTP_ID == ptpId
                                   && x.ProjectId == this.CurrUser.LoginProjectId
                                   && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
                                   && x.WarehouseId == WarehouseId
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
index a35cbe29..dd8a14c5 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
@@ -212,15 +212,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
 
-        /// <summary>
-        /// panelTopRegion 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel panelTopRegion;
-
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
