From 65a5fdae3e408eb2a038fbc813098d64c2f27dd8 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Fri, 27 Oct 2023 17:46:32 +0800
Subject: [PATCH] 2023-10-27

---
 DataBase/版本日志/SGGLDB_V2023-10-27.sql      |  57 ++++++++++++++
 .../1-6合同管理（Menu_PHTGL）.sql             |  21 ++---
 .../PhtglContracttrackService .cs             |   4 +-
 .../Excel/DataIn/合同执行跟踪导入模板.xlsx    | Bin 11796 -> 11740 bytes
 SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx      |   2 +-
 .../WeldingManage/SelectTaskWeldJoint.aspx    |  30 ++++----
 .../WeldingManage/SelectTaskWeldJoint.aspx.cs |  38 +++++++++
 .../HJGL/WeldingManage/WeldReport.aspx        |   4 +-
 .../HJGL/WeldingManage/WeldReportEdit.aspx    |  28 ++++---
 .../HJGL/WeldingManage/WeldReportEdit.aspx.cs |  72 ++++++++++++++++++
 .../WeldReportEdit.aspx.designer.cs           |  27 +++++++
 .../HJGL/WeldingManage/WeldTask.aspx          |  14 ++--
 .../ContractTrackComparison.aspx.cs           |   2 +-
 .../ContractCompile/ContractTrackList.aspx    |   5 ++
 .../ContractCompile/ContractTrackList.aspx.cs |   5 +-
 .../ContractTrackList.aspx.designer.cs        |   9 +++
 16 files changed, 268 insertions(+), 50 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2023-10-27.sql

diff --git a/DataBase/版本日志/SGGLDB_V2023-10-27.sql b/DataBase/版本日志/SGGLDB_V2023-10-27.sql
new file mode 100644
index 00000000..5356b3f7
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-10-27.sql
@@ -0,0 +1,57 @@
+
+Alter VIEW [dbo].[View_HJGL_Batch_PointBatchItem]
+AS
+/*************点口明细表*************/
+SELECT PointBatchItem.PointBatchItemId,
+PointBatchItem.PointBatchId,
+PointBatch.ProjectId,
+PointBatch.UnitId,
+PointBatch.DetectionTypeId,
+PointBatch.PointBatchCode,
+Pipeline.UnitWorkId,
+PointBatchItem.WeldJointId,
+(CASE PointBatchItem.PointState WHEN '1' THEN '点口' WHEN '2' THEN '扩透' END) AS PointState,
+(CASE PointBatchItem.IsBuildTrust WHEN 1 THEN '是' ELSE '' END) AS IsBuildTrust,
+(CASE WHEN PointBatchItem.IsAudit=1 THEN '是' 
+      WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '否'
+      WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS  NULL THEN '' END) AS PointIsAudit,
+PointBatchItem.PointDate,--点口日期
+(CASE  PointBatchItem.IsWelderFirst WHEN 1 THEN '是' ELSE '' END) AS IsWelderFirst,
+PointBatchItem.RepairDate,--返修日期
+PointBatchItem.RepairRecordId,
+PointBatchItem.CutDate,--切除日期
+PointBatchItem.PBackingWelderId,--返修打底焊工
+PointBatchItem.PCoverWelderId,--返修盖面焊工
+UnitWork.UnitWorkCode,--工区号
+WeldJoint.WeldJointCode,--焊口号
+WeldJoint.BackingWelderId AS WelderId, --焊工ID
+BackingWelder.WelderCode AS BackingWelderCode,
+CoverWelder.WelderCode AS CoverWelderCode,
+WeldType.WeldTypeCode,
+WeldJoint.JointAttribute,
+WeldJoint.JointArea,--焊接区域
+WeldJoint.Size,--实际寸径
+WeldingDaily.WeldingDate,--焊接日期
+WeldJoint.PipelineId, --管线ID
+WeldJoint.Material1Id AS Mat, --材质
+WeldJoint.Specification,  --规格
+Pipeline.PipelineCode, --管线号
+PipingClass.PipingClassName , --管道等级
+WeldJoint.BackingWelderId,
+WeldJoint.CoverWelderId
+FROM dbo.HJGL_Batch_PointBatchItem AS PointBatchItem
+LEFT JOIN dbo.HJGL_Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId
+LEFT JOIN dbo.HJGL_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=PointBatchItem.WeldJointId
+LEFT JOIN dbo.HJGL_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
+LEFT JOIN dbo.WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId=Pipeline.UnitWorkId
+LEFT JOIN dbo.HJGL_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId
+LEFT JOIN dbo.Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId
+LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=WeldJoint.BackingWelderId
+LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=WeldJoint.CoverWelderId
+LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId
+LEFT JOIN HJGL_Hard_TrustItem HardTrustItem ON HardTrustItem.WeldJointId=PointBatchItem.WeldJointId
+where (WeldJoint.IsHotProess!=1 or (WeldJoint.IsHotProess=1 and HardTrustItem.IsPass=1))
+and BackingWelder.ProjectId=Pipeline.ProjectId and CoverWelder.ProjectId=Pipeline.ProjectId 
+ 
+go
+
diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
index c792a835..38fea7e0 100644
--- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
+++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
@@ -170,25 +170,26 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
 		VALUES ( N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'�۸���ϵ',30,N'0',N'Menu_PHTGL',0,0,1)
 		GO
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'����',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'��������',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'����',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'�ֽṹԤ�ƹ���',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'����',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'���չܵ���װ����',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'�DZ�',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'�����豸��װ����',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'����ˮ',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'�DZ��豸�ֳ�������װ����',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'ůͨ',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'���ǰ�װ����',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'��������',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'ˮů��װ����',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'��������',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'�������ȹ���',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
-			VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'�ٽ���ʩ',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'�����⹤��',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
+			INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+			VALUES ( N'2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B',N'��������',100,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
 		GO
-
  INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
 		VALUES ( N'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'��ִͬ�и���',40,N'0',N'Menu_PHTGL',0,0,1)
 		GO
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index 6e94061e..1f07a600 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
@@ -167,6 +167,7 @@ namespace BLL
             PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id);
 
         }
+         
 
 
         public static void UpdatePHTGL_ContractTrack(PHTGL_ContractTrack newtable)
@@ -329,8 +330,7 @@ namespace BLL
                 responeData.code = 0;
                 responeData.message = "没有数据";
                 return responeData;
-            }
-
+            }  
             foreach (var item in modeList)
             {
                 item.ContractId = contractid;
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx
index 22236e62a34d48d04bff8480e96133b64e8db83d..638b33077a570eaeaa2b4018cb27da00d9a95f34 100644
GIT binary patch
delta 4314
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

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

diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx
index 662e10a2..72e88f8b 100644
--- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx
@@ -24,7 +24,7 @@
                             <f:TextBox runat="server" Label="评定编号" ID="txtWeldingProcedureCode" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
                             </f:TextBox>
-                            <f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                            <f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="True"
                                             Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
                             </f:DropDownList>
 
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
index e357bfc3..eecf129c 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
@@ -42,7 +42,7 @@
                         </f:Tree>
                     </Items>
                 </f:Panel>
-                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" 
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊口信息"
                     TitleToolTip="焊口信息" AutoScroll="true">
                     <Toolbars >
@@ -63,11 +63,11 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
-                            EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound"   DisableUnselectableRows="true"
-                            DataKeyNames="WeldJointId" AllowColumnLocking="true" EnableColumnLines="true"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息" 
+                            EnableCollapse="true" KeepCurrentSelection="true" runat="server"  BoxFlex="1" OnRowDataBound="Grid1_RowDataBound"   DisableUnselectableRows="true"
+                            DataKeyNames="WeldJointId"   EnableColumnLines="true"
                             DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointNum"
-                            SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
+                            SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"  OnRowCommand="Grid1_RowCommand"
                             PageSize="1000" EnableCheckBoxSelect="true">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@@ -104,35 +104,35 @@
                             <Columns>                            
                                 <f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
                                     DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="90px" Locked="true">
+                                    TextAlign="Center" Width="50px" >
                                 </f:RenderField>
                                 <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
                                     DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="140px" Locked="true">
+                                    TextAlign="Center" Width="80px" >
                                 </f:RenderField>
                                 <f:RenderField HeaderText="备注" ColumnID="Remark"
                                     DataField="Remark" SortField="Remark" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="140px" Locked="true">
+                                    TextAlign="Center" Width="80px" >
                                 </f:RenderField>
                                  <f:RenderField HeaderText="材质1" ColumnID="Material1Code"
                                     DataField="Material1Code"  FieldType="String"
-                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="150px" ExpandUnusedSpace="true">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="材质2" ColumnID="Material2Code"
                                     DataField="Material2Code" FieldType="String"
-                                    HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true">
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="140px" ExpandUnusedSpace="true">
                                 </f:RenderField>
                                  <f:RenderField HeaderText="达因" ColumnID="Size"
                                     DataField="Size" SortField="Size" FieldType="String"
-                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="外径" ColumnID="Dia" DataField="Dia" SortField="Dia" 
-                                    FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"  Width="120px"  >
+                                    FieldType="Double" HeaderTextAlign="Center" TextAlign="Center"  Width="80px"  >
                                 </f:RenderField>
                                 <f:RenderField HeaderText="公称直径" ColumnID="DNDia" DataField="DNDia" SortField="DNDia" 
-                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left"  Width="120px"  >
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center"  Width="120px"  >
                                 </f:RenderField>
-                                <f:TemplateField ColumnID="WPQCode" Width="120px" HeaderText="评定编号" HeaderTextAlign="Center" TextAlign="Right">
+                                <f:TemplateField ColumnID="WPQCode" Width="160px" HeaderText="评定编号" HeaderTextAlign="Center" TextAlign="Center">
                                     <ItemTemplate>
                                         <asp:Label ID="Label2" runat="server" Text='<%# BLL.WeldJointService.GetWPQCodeByWeldJointId(Eval("WeldJointId")) %>'></asp:Label>
                                     </ItemTemplate>
@@ -157,6 +157,8 @@
                                     DataField="WeldingRodCode"  FieldType="String"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true">
                                 </f:RenderField>
+                                <f:LinkButtonField Width="60px" TextAlign="Center" ConfirmText="是否确认重置焊评？" ConfirmTarget="Top" Text="重置焊评"
+                                                   CommandName="ResetWpq"   />
                             </Columns>
                         </f:Grid>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
index 4c251b90..c73d1a4a 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
@@ -1,6 +1,7 @@
 using Aspose.Words;
 using BLL;
 using Model;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -621,5 +622,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
             };      
         }
+
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+
+            if (e.CommandName == "ResetWpq")
+            {
+                var weldJointId = e.RowID;
+                var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId);
+                if (model != null)
+                {
+                    model.WPQId = null;
+                    WeldJointService.UpdateWeldJoint(model);
+
+                    List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
+                    if (wpqList != null)
+                    {
+                        Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
+                        Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
+
+                        newJot.WPQId = wps.WPQId;
+                        newJot.WeldJointId = model.WeldJointId;
+                        newJot.WeldingRod = wps.WeldingRod;
+                        newJot.WeldingWire = wps.WeldingWire;
+                        newJot.WeldingMethodId = wps.WeldingMethodId;
+                        newJot.GrooveTypeId = wps.GrooveType;
+                        newJot.PreTemperature = wps.PreTemperature;
+                        newJot.IsHotProess = wps.IsHotProess;
+                        newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
+
+                        BLL.WeldJointService.UpdateConWeldJoint(newJot);
+                    }
+
+                    BindGrid();
+                    ShowNotify("焊评已重置！", MessageBoxIcon.Success);
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index 0829e1cf..f15bdc0f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -14,7 +14,7 @@
     <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
         <Items>
             <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                     EnableCollapse="true" Width="200px" Title="WBS目录"
+                     EnableCollapse="true" Width="320px" Title="WBS目录"
                      ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
                      IconFont="ArrowCircleLeft">
                 <Toolbars>
@@ -27,7 +27,7 @@
                     </f:Toolbar>
                 </Toolbars>
                 <Items>
-                    <f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接日报"
+                    <f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接日报"
                             OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
                             EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
                             EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
index b4cf4ae9..905b5a2e 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
@@ -74,13 +74,18 @@
                                         </f:DatePicker>
                                     </Items>
                                 </f:FormRow>
-                                <f:FormRow>
+                                <f:FormRow ColumnWidths="50% 0% 25% 25% 25%" >
                                     <Items>
                                         <f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="120px">
                                         </f:TextBox>
                                         <f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="120px"
                                             Hidden="true" CssClass="customlabel">
                                         </f:Label>
+                                        <f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充"  OnClick="btnSelectWelder_Click" >
+                                        </f:Button>
+                                        <f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
+                                        </f:DropDownList>
+                                        <f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"></f:Button>
                                     </Items>
                                 </f:FormRow>
                             </Rows>
@@ -96,32 +101,32 @@
                             <Columns>
                                 <f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
                                     DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="140px">
+                                    TextAlign="Center" Width="50px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
                                     DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
+                                    TextAlign="Center" Width="180px" ExpandUnusedSpace="true">
                                 </f:RenderField>
                                 <f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center" Hidden="true"
-                                    TextAlign="Left">
+                                    TextAlign="Center">
                                     <ItemTemplate>
                                         <asp:Label ID="lbPipeArea" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
                                 <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
                                     DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="180px">
+                                    TextAlign="Center" Width="180px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode" Hidden="true"
                                     DataField="CanWelderCode" SortField="CanWelderCode" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="300px">
+                                    TextAlign="Center" Width="300px">
                                 </f:RenderField>
                                 <%--<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
                                     DataField="CanWelderId" FieldType="String" Hidden="true">
                                 </f:RenderField>--%>
                                 <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
                                     DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="150px">
+                                    TextAlign="Center" Width="150px">
                                     <Editor>
                                         <f:DropDownList ID="drpCoverWelderId" EnableEdit="true" Required="true" runat="server"
                                             ShowRedStar="true">
@@ -130,7 +135,7 @@
                                 </f:RenderField>
                                 <f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
                                     DataField="BackingWelderCode" FieldType="String"
-                                    HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="150px">
                                     <Editor>
                                         <f:DropDownList ID="drpBackingWelderId" EnableEdit="true" Required="true" runat="server"
                                             ShowRedStar="true">
@@ -147,14 +152,14 @@
                                 </f:RenderField>--%>
                                 <f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" 
                                     DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="100px">
+                                    TextAlign="Center" Width="100px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
                                     DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
-                                    TextAlign="Left" Width="70px">
+                                    TextAlign="Center" Width="70px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="达因" ColumnID="Size"
-                                    DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
+                                    DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Center"
                                     Width="70px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
@@ -190,6 +195,7 @@
                                 <f:RenderField HeaderText="打底焊工ID" ColumnID="BackingWelderId" DataField="BackingWelderId"
                                     FieldType="String" Hidden="true">
                                 </f:RenderField>
+                                
                             </Columns>
                             <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index a2340393..86fb613c 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -1112,5 +1112,77 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             }
         }
         #endregion
+
+        #region 批量填充焊工
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSaveWelder_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(drpCanWelder.SelectedValue))
+            {
+                string[] selectedRowId = Grid1.SelectedRowIDArray;
+                for (int i = 0; i < selectedRowId.Count(); i++)
+                {
+                    string weldTaskId = selectedRowId[i];
+                    BLL.WeldTaskService.UpdateWelderTask(weldTaskId, drpCanWelder.SelectedValue);
+                }
+                this.BindGrid(null);
+                drpCanWelder.Items.Clear(); 
+            }
+        }
+
+        protected void btnSelectWelder_Click(object sender, EventArgs e)
+        {
+            GetCanWelderDropDownList();
+        }
+
+        /// <summary>
+        /// 获取能焊焊工下拉列表
+        /// </summary>
+        /// <param name="weldingTask"></param>
+        private void GetCanWelderDropDownList()
+        {
+            drpCanWelder.Items.Clear();
+            string[] selectedRowId = Grid1.SelectedRowIDArray;
+            List<string> canWelder = null;
+            var taskList = from x in Funs.DB.HJGL_WeldTask where x.ProjectId == this.CurrUser.LoginProjectId select x;
+            for (int i = 0; i < selectedRowId.Count(); i++)
+            {
+                Model.HJGL_WeldTask task = taskList.FirstOrDefault(x => x.WeldTaskId == selectedRowId[i]);
+                if (!string.IsNullOrEmpty(task.CanWelderId))
+                {
+                    List<string> jotCanWelder = task.CanWelderId.Split(',').ToList();
+                    if (i == 0)
+                    {
+                        canWelder = jotCanWelder;
+                    }
+                    else
+                    {
+                        canWelder = canWelder.Intersect(jotCanWelder).ToList();
+                    }
+                }
+                else
+                {
+                    canWelder = null;
+                    break;
+                }
+            }
+
+            if (canWelder != null)
+            {
+                var welder = from x in canWelder
+                             join y in Funs.DB.SitePerson_Person on x equals y.PersonId
+                             select new { WelderId = x, y.WelderCode };
+                drpCanWelder.DataValueField = "WelderId";
+                drpCanWelder.DataTextField = "WelderCode";
+                drpCanWelder.DataSource = welder;
+                drpCanWelder.DataBind();
+            }
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
index 95f10054..ae1dafab 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
@@ -203,6 +203,33 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// </remarks>
         protected global::FineUIPro.Label lbAmount;
 
+        /// <summary>
+        /// btnSelectWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSelectWelder;
+
+        /// <summary>
+        /// drpCanWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCanWelder;
+
+        /// <summary>
+        /// btnSaveWelder 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSaveWelder;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
index f77d034a..ed344b06 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
@@ -20,7 +20,7 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="200px" Title="WBS目录"
+                    EnableCollapse="true" Width="250px" Title="WBS目录"
                     ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
                     IconFont="ArrowCircleLeft">
                     <Toolbars>
@@ -34,7 +34,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
                             EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
                             EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
                             <Listeners>
@@ -63,7 +63,7 @@
                                         </f:Button>
                                         <f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
                                         </f:DropDownList>
-                                        <f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click">                                        </f:Button>
+                                        <f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"></f:Button>
                                         <f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件" LabelAlign="Right"></f:TextBox>
                                        
                                         <f:Button runat="server" ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Text="查询" OnClick="btnSearch_Click">
@@ -74,7 +74,7 @@
                                         </f:DatePicker>
                                        <%--  <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
                                         </f:Button>--%>
-                                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click">
+                                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click" Hidden="True">
                                         </f:Button>
 
                                     </Items>
@@ -158,7 +158,7 @@
                                 <f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
                                     DataField="CanWelderId" FieldType="String" Hidden="true">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
+                                <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode" Hidden="True"
                                     DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="110px">
                                     <Editor>
@@ -167,7 +167,7 @@
                                         </f:DropDownList>
                                     </Editor>
                                 </f:RenderField>
-                                <f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
+                                <f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"  Hidden="True"
                                     DataField="BackingWelderCode" FieldType="String"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="110px">
                                     <Editor>
@@ -212,7 +212,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
-            IsModal="true" Width="1200px" Height="650px" OnClose="Window1_Close">
+            IsModal="true" Width="1300px" Height="650px" OnClose="Window1_Close">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuAdd" EnablePostBack="true" runat="server" Text="新增" Hidden="true" Icon="Add" OnClick="btnMenuAdd_Click">
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
index 6068b294..849e9ad9 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
@@ -363,7 +363,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         {
             Response.ClearContent();
             string filename = Funs.GetNewFileName();
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("费用对比统计表" + filename, System.Text.Encoding.UTF8) + ".xls");
             Response.ContentType = "application/excel";
             Response.ContentEncoding = System.Text.Encoding.UTF8;
             this.Grid1.PageSize = 500;
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
index 4d37a22f..e28b7c98 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
@@ -22,6 +22,10 @@
         .f-grid-row.red {
             background-color: Yellow;
         }
+         .customlabel span {
+     color: red;
+     font-weight: bold;
+ }
     </style>
 </head>
 <body>
@@ -45,6 +49,7 @@
                                             LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged">
                                         </f:DropDownList>
                                         <f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
+                                        <f:Label ID="lbTotalPrice" CssClass="customlabel" runat="server" Label="合价"  LabelWidth="70px"></f:Label>        
                                         <f:ToolbarFill runat="server" />
                                         
                                         <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
index 365ac68c..6a61151a 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
@@ -53,7 +53,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             //tb = GetFilteredTable(Grid1.FilteredData, tb);
             Grid1.DataSource = tb;
             Grid1.DataBind();
-
+            var sumTotalPricea = tb.Select(x =>Funs.GetNewDecimalOrZero(x.TotalPrice) ).ToList().Sum();
+            lbTotalPrice.Text = sumTotalPricea.ToString();
         }
         
         #endregion
@@ -545,7 +546,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         {
             Response.ClearContent();
             string filename = Funs.GetNewFileName();
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同价格信息表" + filename, System.Text.Encoding.UTF8) + ".xls");
             Response.ContentType = "application/excel";
             Response.ContentEncoding = System.Text.Encoding.UTF8;
             this.Grid1.PageSize = 500;
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
index bf1f7c53..87f8e89a 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
@@ -86,6 +86,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.Label txtContractName;
 
+        /// <summary>
+        /// lbTotalPrice 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbTotalPrice;
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>