From 914f20c238be4db4606ec9a41522e56c138d6945 Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Sun, 26 May 2024 08:28:18 +0800
Subject: [PATCH] 1111

---
 CreateModel.bat                               |   4 +-
 HJGL/.vs/HJGL/config/applicationhost.config   |   4 +-
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1063424 -> 898560 bytes
 HJGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 HJGL/FineUIPro.Web/Web.config                 |   2 +-
 .../WeldingProcess/PMI/PMIDelegationEdit.aspx |   4 +-
 .../PMI/PMIDelegationEdit.aspx.cs             |  35 ++--
 .../PMI/PMIDelegationReport.aspx              |  96 +++++++++
 .../PMI/PMIDelegationReport.aspx.cs           | 180 +++++++++++++++++
 .../PMI/PMIDelegationReport.aspx.designer.cs  | 188 ++++++++++++++++++
 .../WeldingProcess/PMI/PMISelectList.aspx.cs  |  35 ++--
 HJGL/Model/Model.cs                           |  24 +++
 12 files changed, 548 insertions(+), 32 deletions(-)
 create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx
 create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
 create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs

diff --git a/CreateModel.bat b/CreateModel.bat
index 2f27853..27ceb4a 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS100COMNTOOLS%"vsvars32.bat
+@call "%VS150%"
 
-SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config
index 1963de0..e47cfd0 100644
--- a/HJGL/.vs/HJGL/config/applicationhost.config
+++ b/HJGL/.vs/HJGL/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="WebApi" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
+                    <virtualDirectory path="/" physicalPath="E:\婀涙睙宸存柉澶玕Basf_TCC7\HJGL\WebApi" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\婀涙睙宸存柉澶玕Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 0d35fb2a4d353079f04c3fd28b272cf4f37eedf5..454cc7ed0c228606fcd92520f76b56b8095a949d 100644
GIT binary patch
delta 16347
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
ShvQbv`@4}S+J1Ey?fwstDj~N3

delta 55766
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

diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index bc5a722..f843a5d 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1235,6 +1235,7 @@
     <Content Include="WeldingProcess\DataIn\DataInEdit.aspx" />
     <Content Include="WeldingProcess\PMI\PMIDelegation.aspx" />
     <Content Include="WeldingProcess\PMI\PMIDelegationEdit.aspx" />
+    <Content Include="WeldingProcess\PMI\PMIDelegationReport.aspx" />
     <Content Include="WeldingProcess\PMI\PMIDetectionEntry.aspx" />
     <Content Include="WeldingProcess\PMI\PMISelectList.aspx" />
     <Content Include="WeldingProcess\TestPackageManage\AItemEndCheck.aspx" />
@@ -5422,6 +5423,13 @@
     <Compile Include="WeldingProcess\PMI\PMIDelegationEdit.aspx.designer.cs">
       <DependentUpon>PMIDelegationEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="WeldingProcess\PMI\PMIDelegationReport.aspx.cs">
+      <DependentUpon>PMIDelegationReport.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WeldingProcess\PMI\PMIDelegationReport.aspx.designer.cs">
+      <DependentUpon>PMIDelegationReport.aspx</DependentUpon>
+    </Compile>
     <Compile Include="WeldingProcess\PMI\PMIDetectionEntry.aspx.cs">
       <DependentUpon>PMIDetectionEntry.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index baa8804..9ecdad1 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx
index 138bc7c..3881793 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx
@@ -133,7 +133,9 @@
                                 <f:RenderField HeaderText="WeldJointId" ColumnID="WeldJointId" DataField="WeldJointId"
                                     FieldType="String" Hidden="true">
                                 </f:RenderField>
-
+                                 <f:RenderField HeaderText="WorkAreaId" ColumnID="WorkAreaId" DataField="WorkAreaId"
+                                     FieldType="String" Hidden="true">
+                                 </f:RenderField>
                                 <f:RenderField HeaderText="Id" ColumnID="Id"
                                     DataField="Id" FieldType="String" Hidden="true">
                                 </f:RenderField>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
index c614310..3739f7b 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                 }
             
                 //url鏌ヨ
-                string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}", "缂栬緫 - ");
+                string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}&installId={drpInstallationId.SelectedValue}", "缂栬緫 - ");
                 PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
             }
             else
@@ -285,19 +285,24 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         {
             string[] arr = weldJointIds.Split('|');
             JArray mergedData = Grid1.GetMergedData();
-            var result = Funs.DB.View_Pipeline_WeldJoint.Select(t => new View_PMI_DelegationDetails {
-                   WeldJointId= t.WeldJointId,
-                PipelineCode= t.PipelineCode,
-                ProjectId= t.ProjectId,
-                 Acceptance="",
-                    QualityNo="",
-                WeldJointCode=t.WeldJointCode,
-                Specification=t.Specification,
-                MaterialCode=t.MaterialCode,
-                WorkAreaId=t.WorkAreaId,
-                Status=0,
-                PMIId=this.PMIDelegationId
-            }).Where(t => arr.Contains(t.WeldJointId)).ToList();
+            var result = Funs.DB.View_Pipeline_WeldJoint.Where(t =>t.UnitId==this.drpUnitId.SelectedValue
+            && t.InstallationId==this.drpInstallationId.SelectedValue   
+            &&arr.Contains(t.WeldJointId))
+                .Select(t => new View_PMI_DelegationDetails
+                {
+                    WeldJointId = t.WeldJointId,
+                    PipelineCode = t.PipelineCode,
+                    ProjectId = t.ProjectId,
+                    Acceptance = "",
+                    QualityNo = "",
+                    WeldJointCode = t.WeldJointCode,
+                    Specification = t.Specification,
+                    MaterialCode = t.MaterialCode,
+                    WorkAreaId = t.WorkAreaId,
+                    Status = 0,
+                    PMIId = this.PMIDelegationId
+                })
+                .ToList();
             result.ForEach(item =>
             {
                 item.Id = SQLHelper.GetNewID(typeof(PMI_DelegationDetails));
@@ -317,6 +322,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                     newTrustItem.WeldJointId = values.Value<string>("WeldJointId").ToString();
                     newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
                     newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
+                    newTrustItem.WorkAreaId = values.Value<string>("WorkAreaId").ToString();
                     newTrustItem.WeldJointCode = values.Value<string>("WeldJointCode").ToString();
                     newTrustItem.Specification =HttpUtility.HtmlDecode(values.Value<string>("Specification").ToString());
                     newTrustItem.MaterialCode = values.Value<string>("MaterialCode").ToString();
@@ -349,6 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                 newTrustItem.JointId = values.Value<string>("WeldJointId").ToString();
                 newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
                 newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
+                newTrustItem.WorkAreaId = values.Value<string>("WorkAreaId").ToString();
                 newTrustItem.Status = 0;
                 newTrustItem.CheckTime = DateTime.Now;
                 newTrustItem.ReportTime = DateTime.Now;
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx
new file mode 100644
index 0000000..ec96cd2
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx
@@ -0,0 +1,96 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegationReport.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegationReport" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>PMI妫�娴嬫姤鍛�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="PMI妫�娴嬫姤鍛�"
+                    EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PipelineCode"
+                    AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                    SortField="WorkAreaCode,PipelineCode" SortDirection="DESC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpUnitId" runat="server" Label="<%$ Resources:Lan,UnitName %>"
+                                    LabelAlign="Right" Width="280px" AutoPostBack="true" OnSelectedIndexChanged="drpUnitId_SelectedIndexChanged">
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>"
+                                    LabelAlign="Right" Width="280px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpIsALl" OnSelectedIndexChanged="drpIsALl_SelectedIndexChanged" runat="server" Label="绛涢�夋姤璀�" LabelAlign="Right" Width="200px">
+
+                                    <f:ListItem Text="鍏ㄩ儴" Value="鍏ㄩ儴" />
+                                    <f:ListItem Text="鎶ヨ" Value="鎶ヨ" />
+                                </f:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="BtnAnalyse" Text="<%$ Resources:Lan,Statistics %>" Icon="ChartPie"
+                                    runat="server" OnClick="BtnAnalyse_Click">
+                                </f:Button>
+
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtPipelineCode" runat="server" Label="<%$ Resources:Lan,PipelineCode %>"
+                                    LabelAlign="Right" Width="280px">
+                                </f:TextBox>
+                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                </f:ToolbarFill>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" HeaderText="<%$ Resources:Lan,SerialNumber %>"
+                            Width="60px" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField HeaderText="瑁呯疆" ColumnID="InstallationCode" DataField="InstallationCode" Width="120"></f:RenderField>
+                        <f:RenderField HeaderText="鍖哄煙" ColumnID="WorkAreaCode" DataField="WorkAreaCode" Width="120"></f:RenderField>
+                        <f:RenderField HeaderText="绠＄嚎" ColumnID="PipelineCode" DataField="PipelineCode" Width="160"></f:RenderField>
+                        <f:RenderField HeaderText="闇�瑕丳MI鐒婂彛鏁伴噺" ColumnID="PMINum" DataField="PMINum" Width="160"></f:RenderField>
+                        <f:RenderField HeaderText="棰勫埗妫�娴嬫暟閲�" ColumnID="PMIBySNum" DataField="PMIBySNum" Width="160"></f:RenderField>
+                        <f:TemplateField HeaderText="棰勫埗妫�娴嬫瘮渚�" ColumnID="RateBys" Width="160">
+                            <ItemTemplate>
+                                <asp:Label ID="labRateBys" runat="server" Text='<%#Eval("RateBys")+"%" %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField HeaderText="瀹夎妫�娴嬫暟閲�" ColumnID="PMIByFNum" DataField="PMIByFNum" Width="160"></f:RenderField>
+                        <f:TemplateField HeaderText="瀹夎妫�娴嬫瘮渚�" ColumnID="RateByf" Width="160">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%#Eval("RateByf")+"%" %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
new file mode 100644
index 0000000..261daee
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
@@ -0,0 +1,180 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.WeldingProcess.PMI
+{
+    public partial class PMIDelegationReport : PageBase
+    {
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnitId, true, this.CurrUser.LoginProjectId, BLL.Const.UnitType_5, Resources.Lan.PleaseSelect);//鍗曚綅
+                BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, this.drpUnitId.SelectedValue, string.Empty, Resources.Lan.PleaseSelect);//鍖哄煙
+              
+            }
+        }
+
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        private void BindGrid()
+        {
+            string sql = @"select *from (
+                        select 
+                        projectId,
+                        InstallationId,
+                        WorkAreaId,
+                        UnitId,
+                        PipelineId,
+                        InstallationCode,
+                        WorkAreaCode,
+                        PipelineCode,
+                        PMINum, 
+                        (convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100) as RateBys,
+                        PMIBySNum,
+                        (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100) as RateByf,
+                        PMIByFNum
+                        from (
+                        select 
+                        a.projectId,
+                        a.InstallationId,
+                        a.WorkAreaId,
+                        a.UnitId,
+                        a.PipelineId,
+                        b.InstallationCode,
+                        c.WorkAreaCode,
+                        a.PipelineCode,
+                        (select count(1) from Pipeline_WeldJoint as d where isPMI=1 and d.PipelineId=a.PipelineId) as PMINum,
+                        (
+	                        select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
+	                        inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
+	                        where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
+	                        and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='娲诲姩S' and pwj.isPMI=1
+                        )  as PMIBySNum,
+                        (
+	                        select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
+	                        inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
+	                        where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
+	                        and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='鍥哄畾F' and pwj.isPMI=1
+                        )  as PMIByFNum
+                        from  Pipeline_Pipeline as a
+                        left join Project_Installation as b on a.InstallationId=b.InstallationId
+                        left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId 
+                        ) as t 
+                        ) as H where projectId=@projectId and RateBys>0  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                sql += " and UnitId=@unitId";
+                listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
+            }
+            if (this.drpWorkAreaId.SelectedValue != BLL.Const._Null)
+            {
+                sql += " and WorkAreaId=@unitId";
+                listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue));
+            }
+            if (this.drpIsALl.SelectedValue!="鍏ㄩ儴")
+            {
+                sql += " and  RateBys<=2";
+            }
+            if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
+            {
+                sql += " and PipelineCode like '%@PipelineCode%'";
+                listStr.Add(new SqlParameter("@PipelineCode", this.txtPipelineCode.Text.Trim()));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
+            this.Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 鏀瑰彉绱㈠紩浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+     
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 缁熻鎸夐挳浜嬩欢
+        /// <summary>
+        /// 缁熻
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 涓嬫媺閫夋嫨浜嬩欢
+        /// <summary>
+        /// 鍗曚綅涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpWorkAreaId.Items.Clear();
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, this.drpUnitId.SelectedValue, string.Empty, Resources.Lan.PleaseSelect);
+            }
+            else
+            {
+                Funs.FineUIPleaseSelect(this.drpWorkAreaId, Resources.Lan.PleaseSelect);
+            }
+            this.drpWorkAreaId.SelectedValue = BLL.Const._Null;
+        }
+
+        protected void drpIsALl_SelectedIndexChanged(object obj, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs
new file mode 100644
index 0000000..37f5fa9
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs
@@ -0,0 +1,188 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.WeldingProcess.PMI
+{
+
+
+    public partial class PMIDelegationReport
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// drpUnitId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitId;
+
+        /// <summary>
+        /// drpWorkAreaId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWorkAreaId;
+
+        /// <summary>
+        /// drpIsALl 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpIsALl;
+
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// BtnAnalyse 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtPipelineCode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineCode;
+
+        /// <summary>
+        /// ToolbarFill2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill2;
+
+        /// <summary>
+        /// labNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// labRateBys 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labRateBys;
+
+        /// <summary>
+        /// Label1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs
index 5734da7..06427de 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs
@@ -1,4 +1,6 @@
 锘縰sing BLL;
+using Model;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
@@ -15,6 +17,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         string ProjectId = string.Empty;
         string PMIId = string.Empty;
         string weldJointIds=string.Empty;
+        string installId=string.Empty;
         #region 鍔犺浇椤甸潰
         /// <summary>
         /// 鍔犺浇椤甸潰
@@ -27,6 +30,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             this.ProjectId = this.CurrUser.LoginProjectId;
             this.PMIId = Request.Params["PMIId"] ?? "";
             this.weldJointIds = Request.Params["weldJointIds"] ?? "";
+            this.installId = Request.Params["installId"];
             if (!IsPostBack)
             {
                 this.InitTreeMenu();//鍔犺浇鏍�
@@ -54,13 +58,23 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                           b in Funs.DB.PMI_DelegationDetails.AsQueryable() on 
                           a.Id equals b.PMIId
                           select b.JointId
-                          ).Distinct().ToList();    
+                          ).Distinct().ToList();
 
             //鏌ヨ甯︽湁PMI澶勭悊鐨勭绾挎暟鎹�
-            var iso = from x in Funs.DB.View_Pipeline_WeldJoint
-                      where x.ProjectId == this.ProjectId  && x.IsPMI == true && x.UnitId == this.UnitId
-                      select new { x.PipelineCode, x.PipelineId,x.WeldJointId };                 //from x in Funs.DB.Pipeline_Pipeline where x.ProjectId == this.ProjectId && x.UnitId == this.UnitId select x;
-
+            var iso = (from a in Funs.DB.Pipeline_Pipeline join b
+                       in Funs.DB.Project_WorkArea on a.WorkAreaId equals b.WorkAreaId
+                       join c in Funs.DB.Pipeline_WeldJoint on a.PipelineId equals c.PipelineId
+                       where a.ProjectId==this.ProjectId && a.UnitId==this.UnitId && 
+                       a.InstallationId==this.installId && c.IsPMI==true
+                       select new {
+                           a.PipelineCode,
+                           a.PipelineId,
+                           b.WorkAreaId,
+                           b.WorkAreaCode,
+                           c.WeldJointId,
+                           c.WeldJointCode
+                       });
+                      
             if (listData.Count > 0)
             {
                iso = iso.Where(e => !listData.Contains(e.WeldJointId));
@@ -69,14 +83,14 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             {
                 iso = iso.Where(e => e.PipelineCode.Contains(this.txtIsono.Text.Trim()));
             }
-            var isoList = iso.Select(x => new {x.PipelineId,x.PipelineCode }).OrderBy(x => x.PipelineCode).Distinct().ToList();
+            var isoList = iso.Select(x => new { x.PipelineId,x.PipelineCode,x.WorkAreaCode}).OrderBy(x => x.PipelineCode).Distinct().ToList();
             if (isoList.Count > 0)
             {
                 foreach (var q in isoList)
                 {
                     TreeNode newNode = new TreeNode();
                     newNode.NodeID = q.PipelineId;
-                    newNode.Text = q.PipelineCode;
+                    newNode.Text = q.PipelineCode + "(" + q.WorkAreaCode + ")";
                     newNode.EnableClickEvent = true;
                     rootNode.Nodes.Add(newNode);
                 }
@@ -128,7 +142,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                          ).Distinct().ToList();
 
             string[] arr = this.weldJointIds.Split('|');
-            var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true);
+            var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true &&  t.PipelineId == this.tvControlItem.SelectedNodeID);
             if (arr.Length > 0)
             {
                 listData.Add(arr[0]);
@@ -141,10 +155,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             {
                 query = query.Where(t => t.WeldJointCode == this.txtJointNo.Text);
             }
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
-            {
-                query = query.Where(t => t.PipelineId == this.tvControlItem.SelectedNodeID);
-            }
+            
             var data= query.ToList() ;
             if (!string.IsNullOrEmpty(weldJointIds))
             {
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index 8f2cc39..8841de2 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -22792,6 +22792,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
+		private string _WorkAreaId;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22814,6 +22816,8 @@ namespace Model
     partial void OnCheckTimeChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
+    partial void OnWorkAreaIdChanging(string value);
+    partial void OnWorkAreaIdChanged();
     #endregion
 		
 		public PMI_DelegationDetails()
@@ -23001,6 +23005,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")]
+		public string WorkAreaId
+		{
+			get
+			{
+				return this._WorkAreaId;
+			}
+			set
+			{
+				if ((this._WorkAreaId != value))
+				{
+					this.OnWorkAreaIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkAreaId = value;
+					this.SendPropertyChanged("WorkAreaId");
+					this.OnWorkAreaIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;