2023-10-25

DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql

@@ -204,21 +204,8 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
                         INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
                         VALUES ( N'C1708178-C52B-4D32-9849-C69622D96105',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'增加',1)
                     GO
-
         INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
-                    VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS工作包',N'PHTGL/ContractCompile/ContractWBS.aspx',20,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
+                    VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'费用对比统计',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',20,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
-                    GO
-                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-                        VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'修改',2)
-                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-                        VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'删除',3)
-                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-                        VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'保存',4)
-                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-                        VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'增加',1)
-                    GO
-        INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
-                    VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'费用对比统计',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',30,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
                     GO
                         INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
                         VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'修改',2)
@@ -229,6 +216,20 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
                         INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
                         VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'增加',1)
                     GO
+
+        INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+                    VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS工作包',N'PHTGL/ContractCompile/ContractWBS.aspx',30,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
+                    GO
+                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+                        VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'修改',2)
+                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+                        VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'删除',3)
+                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+                        VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'保存',4)
+                        INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+                        VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'增加',1)
+                    GO
+
         INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
                     VALUES ( N'F545E899-B3B5-4B49-A741-DE19356553D5',N'进度检测',N'PHTGL/ContractCompile/ContractTrackProgressDetection.aspx',40,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
                     GO

SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs

@@ -61,7 +61,9 @@ namespace BLL
                         (string.IsNullOrEmpty(table.SettledQuantity) ||
                          x.SettledQuantity.Contains(table.SettledQuantity)) &&
                         (string.IsNullOrEmpty(table.ContractId) ||
-                         x.ContractId.Contains(table.ContractId))
+                         table.ContractId.Split(',').Contains(x.ContractId))&&
+                        (string.IsNullOrEmpty(table.ProjectId) ||
+                         x.ProjectId.Contains(table.ProjectId))
 
                     select x
                 ;
@@ -269,6 +271,39 @@ namespace BLL
             return SumSettledAmount;
         }
 
+        /// <summary>
+        /// 根据主键获取工程量偏差
+        /// </summary>
+        /// <returns></returns>
+        public static decimal GetQuantityOffset(object id)
+        {
+            decimal result = 0;
+            var model = GetPHTGL_ContractTrackById(id.ToString());
+            if (model != null)
+            {
+                result = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
+                         Funs.GetNewDecimalOrZero(model.SettledQuantity);
+            }
+
+            return result;
+
+        }
+        /// <summary>
+        /// 根据主键获取费用偏差
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static decimal GetAmountOffset(object id)
+        {
+            decimal result = 0;
+            var model = GetPHTGL_ContractTrackById(id.ToString());
+            if (model != null)
+            {
+                result =(model.EstimatedAmount??0 )- ( model.SettledAmount??0);
+            }
+
+            return result;
+        }
         public static ResponeData ImportData(string path, string contractid, string projectid)
         {
             var responeData = new ResponeData();

SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs

@@ -189,7 +189,7 @@ namespace BLL
                     }
                     else
                     {
-                        item.ACWP_Percentage = Math.Round(((item.ACWP_Quantity ?? 0) / settledAmount) * contractWeight * 100, 2);
+                        item.ACWP_Percentage = Math.Round(((item.ACWP_OutputValue ?? 0) / settledAmount) * contractWeight * 100, 2);
                     }
 
                     item.BCWS_OutputValue = (item.BCWS_Quantity ?? 0) * totalCostFixedComprehensiveUnitPrice;
@@ -199,7 +199,7 @@ namespace BLL
                     }
                     else
                     {
-                        item.BCWS_Percentage = Math.Round(((item.BCWS_Quantity ?? 0) / settledAmount) * contractWeight * 100, 2) ;
+                        item.BCWS_Percentage = Math.Round(((item.BCWS_OutputValue ?? 0) / settledAmount) * contractWeight * 100, 2) ;
                     }
                     UpdatePHTGL_ContractTrackProgress(item);
                 }

SGGL/BLL/ProjectData/UnitWorkService.cs

@@ -545,7 +545,27 @@ namespace BLL
             }
             return unitWorkName;
         }
-
+        public static string GetUnitWorkName(object unitWorkIds)
+        {
+            string unitWorkName = string.Empty;
+            if (unitWorkIds!=null&&!string.IsNullOrEmpty(unitWorkIds.ToString()))
+            {
+                string[] strs = unitWorkIds.ToString().Split(',');
+                foreach (var item in strs)
+                {
+                    var un = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(item);
+                    if (un != null)
+                    {
+                        unitWorkName += un.UnitWorkName + GetProjectType(un.ProjectType) + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(unitWorkName))
+                {
+                    unitWorkName = unitWorkName.Substring(0, unitWorkName.LastIndexOf(","));
+                }
+            }
+            return unitWorkName;
+        }
         public static string getWorkAreaIdByWorkAreaName(string projectId, string workAreaName)
         {
             string id = string.Empty;

SGGL/BLL/SysManage/UnitService.cs

@@ -771,7 +771,7 @@ namespace BLL
 
         public static List<Base_Unit> getUnitByUnitIds(string unitids)
         {
-            return Funs.DB.Base_Unit.Where(e => unitids.Contains(e.UnitId)).ToList();
+            return Funs.DB.Base_Unit.Where(e => unitids.Split(',').Contains(e.UnitId)).ToList();
         }
     }
 }

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx

@@ -52,7 +52,7 @@
                                         <f:TextBox ID="txtWeldingDailyCode" Label="焊接日报编号"
                                             ShowRedStar="true" Required="true" runat="server" LabelWidth="120px" LabelAlign="Right" FocusOnPageLoad="true">
                                         </f:TextBox> 
-                                        <f:DropDownList ID="drpUnit" Label="单位名称" runat="server" 
+                                        <f:DropDownList ID="drpUnit" Label="单位名称" runat="server"  AutoPostBack="true" OnSelectedIndexChanged="drpJointAttribute_SelectedIndexChanged"
                                             ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
                                         </f:DropDownList>
                                         <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程编号" Readonly="true"

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs

@@ -216,6 +216,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     task = task.Where(x=>x.JointAttribute== drpJointAttribute.SelectedValue).ToList();
                 }
+
+                if (drpUnit.SelectedValue != Const._Null)
+                {
+                    task = task.Where(x => x.UnitId == drpUnit.SelectedValue).ToList();
+                }
                 if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
                 {
                     task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
@@ -238,6 +243,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     task = task.Where(x => x.JointAttribute == drpJointAttribute.SelectedValue).ToList();
                 }
+                if (drpUnit.SelectedValue != Const._Null)
+                {
+                    task = task.Where(x => x.UnitId == drpUnit.SelectedValue).ToList();
+                }
                 if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
                 {
                     task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs

@@ -890,6 +890,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 Alert.ShowInTop("请选择任务单", MessageBoxIcon.Warning);
             }
         }
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            string str1 = hdItemsString.Text;
+            string str2 = hdTaskWeldJoint.Text;
+            this.InitTreeMenu();
+            var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
+            List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
+            if (unit == null)
+            {
+                GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
+            }
+            else
+            {
+                GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
+
+            }
+            this.BindGrid(GetWeldingTaskList);
+
+        }
 
         #region 删除
         protected void btnMenuDelete_Click(object sender, EventArgs e)

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx

@@ -35,7 +35,7 @@
                                 </f:CheckBox>
                             </Items>
                         </f:Toolbar>
-                        <f:Toolbar  runat="server" ToolbarAlign="Left" >
+                        <f:Toolbar runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
@@ -66,17 +66,21 @@
                                 </f:TextBox>
                                 <f:RadioButtonList ID="rbInput" runat="server" Width="220px"
                                     AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                    <f:RadioItem Value="0" Text="全部" Selected="true"/>
+                                    <f:RadioItem Value="0" Text="全部" Selected="true" />
-                                    <f:RadioItem Value="1" Text="未录入"/>
+                                    <f:RadioItem Value="1" Text="未录入" />
-                                    <f:RadioItem Value="2" Text="已录入"/>
+                                    <f:RadioItem Value="2" Text="已录入" />
                                 </f:RadioButtonList>
 
                                 <f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true"
                                     Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
                                 </f:DropDownList>
+
+                                <f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
+                                    runat="server" ShowRedStar="true" Required="true" LabelWidth="100px" OnSelectedIndexChanged="TextBox_TextChanged"
+                                    Width="180px" LabelAlign="Right">
+                                </f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
-                               
                                 <f:Button ID="btnAutoInput" Text="自动录入" Icon="Add" runat="server" OnClick="btnAutoInput_Click">
                                 </f:Button>
                                 <f:Button ID="btnEdit" Text="编辑" Icon="DateEdit" runat="server" OnClick="btnEdit_Click">

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs

@@ -17,7 +17,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (!IsPostBack)
             {
                 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
-
+                ///焊接属性
+                this.drpJointAttribute.DataTextField = "Text";
+                this.drpJointAttribute.DataValueField = "Value";
+                this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
+                this.drpJointAttribute.DataBind();
                 this.InitTreeMenu();
             }
         }
@@ -262,6 +266,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     strSql += " AND WPQId IS NOT NULL";
                 }
             }
+
+            if (!string.IsNullOrEmpty(drpJointAttribute.SelectedValue))
+            {
+                strSql += " AND JointAttribute =@JointAttribute";
+
+                listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -364,7 +375,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
             {
-                var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null select x;
+                var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID &&x.JointAttribute==drpJointAttribute.SelectedValue && x.WPQId == null select x;
                 if (jotList.Count() > 0)
                 {
                     foreach (var jot in jotList)

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs

@@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
 
+        /// <summary>
+        /// drpJointAttribute 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpJointAttribute;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx

@@ -21,6 +21,12 @@
 
         .f-grid-row.red {
             background-color: Yellow;
+
+        }
+
+        .color1 {
+            background-color: #ff0000;
+            color: #fff;
         }
     </style>
 </head>
@@ -35,9 +41,9 @@
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="合同执行跟踪表" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                             ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
-                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"   OnRowDataBound="Grid1_RowDataBound"  IsFluid="True"
                             AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                            EnableRowDoubleClickEvent="true"  OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True">
+                            EnableRowDoubleClickEvent="true" >
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                                     <Items>
@@ -153,24 +159,24 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice" EnableColumnEdit="False"
-                                    FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="合价(元)" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule" EnableColumnEdit="False"
+                                <f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule" EnableColumnEdit="False" Hidden="True"
                                     FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox15" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" EnableColumnEdit="False"
+                                <f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" EnableColumnEdit="False" Hidden="True" 
                                     FieldType="String" HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox16" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks" EnableColumnEdit="False"
+                                <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks" EnableColumnEdit="False" Hidden="True"
                                     FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox17" runat="server" Required="true"></f:TextBox>
@@ -183,7 +189,7 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="ContractWeight" DataField="ContractWeight" SortField="ContractWeight"  EnableColumnEdit="False"
-                                    FieldType="String" HeaderText="合同权重 " TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="合同权重/% " TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox19" runat="server" Required="true"></f:TextBox>
                                     </Editor>
@@ -203,7 +209,7 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="EstimatedAmount" DataField="EstimatedAmount" SortField="EstimatedAmount"
-                                    FieldType="String" HeaderText="概算金额" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="概算金额(元)" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
                                         </f:NumberBox>
@@ -215,14 +221,23 @@
                                         <f:TextBox ID="TextBox24" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount"
+                                <f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount" EnableColumnEdit="False"
-                                    FieldType="String" HeaderText="预算金额 " TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="预算金额(元) " TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:NumberBox ID="NumberBox3" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
                                         </f:NumberBox>
                                     </Editor>
                                 </f:RenderField>
-
+                                <f:TemplateField ColumnID="QuantityOffset" Width="120px" HeaderText="工程量偏差" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# BLL.PhtglContractTrackService.GetQuantityOffset(Eval("Id")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField> 
+                                <f:TemplateField ColumnID="AmountOffset" Width="120px" HeaderText="费用偏差" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# BLL.PhtglContractTrackService.GetAmountOffset(Eval("Id")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>  
                             </Columns>
                         <%--    <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -256,11 +271,6 @@
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="1200px" Height="650px">
         </f:Window>
-        <f:Window ID="Window3" runat="server" Hidden="true" ShowHeader="true"
-            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window3_OnClose"
-            Title="匹配WBS" EnableIFrame="true" Height="650px"
-            Width="1200px">
-        </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
                 Hidden="true" runat="server" Text="编辑" Icon="TableEdit">

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs

@@ -1,7 +1,9 @@
 using BLL;
+using Model;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -47,51 +49,38 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             table.ContractId = this.ContractId;
             table.ProjectCode = this.txtProjectCode.Text.Trim();
             table.ProjectName = this.txtProjectName.Text.Trim();
-            var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
+            var tb = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(table);
-            Grid1.RecordCount = PhtglContractTrackService.Count;
+            Grid1.RecordCount = tb.Count;
             //tb = GetFilteredTable(Grid1.FilteredData, tb);
             Grid1.DataSource = tb;
             Grid1.DataBind();
            
 
         }
-        private void BindGrid2()
-        {
-            var db = Funs.DB;
-            var q = from x in db.PHTGL_ContractTrackMatchWBS
-                    join y in db.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId
-                    where x.ContractTrackId == Grid1.SelectedRowID
-                    select new
-                    {
-                        x.Id,
-                        x.ContractTrackId,
-                        x.ControlItemAndCycleId,
-                        y.ControlItemAndCycleCode,
-                        y.ControlItemContent,
-                        y.Weights,
-                        x.WorkPackageEstimate
-                    };
-            ;
 
+        protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
+            {
+                var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
+                if (model != null)
+                {
+                    ContractId = model.ContractId;
+                    this.txtContractName.Text = model.ContractName;
+                }
+                else
+                {
+                    ContractId = "";
+                    this.txtContractName.Text = string.Empty;
 
                 }
-        private string GetDeleteScript()
+            }
-        {
+            BindGrid();
-            return Confirm.GetShowReference("确定删除当前数据吗？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
         }
 
         #endregion
 
         #region GV 数据操作
-        /// <summary>
-        /// 过滤表头
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //protected void Grid1_FilterChange(object sender, EventArgs e)
-        //{
-        //    this.BindGrid();
-        //}
 
         /// <summary>
         /// 分页
@@ -104,6 +93,36 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             this.BindGrid();
         }
 
+        protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+        {
+            try
+            {
+                var model = (Model.PHTGL_ContractTrack)e.DataItem;
+                // 工程量偏差
+                decimal QuantityOffset = Funs.GetNewDecimalOrZero(model.EstimatedQuantity) -
+                                         Funs.GetNewDecimalOrZero(model.SettledQuantity);
+                TemplateField bfQuantityOffset = Grid1.FindColumn("QuantityOffset") as TemplateField;
+                if (QuantityOffset < 0)
+                {
+                    e.CellCssClasses[bfQuantityOffset.ColumnIndex] = "color1";
+                }
+
+                // 费用偏差
+                decimal AmountOffset = (model.EstimatedAmount ?? 0) - (model.SettledAmount ?? 0);
+                TemplateField bfAmountOffset = Grid1.FindColumn("AmountOffset") as TemplateField;
+                if (AmountOffset < 0)
+                {
+                    e.CellCssClasses[bfAmountOffset.ColumnIndex] = "color1";
+                }
+
+            }
+            catch (Exception ex)
+            {
+                
+            }
+           
+        }
+
         /// <summary>
         /// 排序
         /// </summary>
@@ -150,16 +169,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             }
         }
 
-        /// <summary>
-        /// Grid行单击事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_OnRowClick(object sender, GridRowClickEventArgs e)
-        {
-            BindGrid2();
-        }
-
         /// <summary>
         /// Grid行双击事件
         /// </summary>
@@ -194,41 +203,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             }
         }
 
-        #region  更新上级WBS内容每月实际费用
-        /// <summary>
-        /// 更新上级WBS内容每月实际费用
-        /// </summary>
-        /// <param name="years"></param>
-        /// <param name="months"></param>
-        /// <param name="PlanNum"></param>
-        /// <param name="parentId"></param>
-        private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue)
-        {
-            Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
-            if (workPackage != null)
-            {
-                Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months);
-                if (parentDetail != null)
-                {
-                    parentDetail.ThisValue += thisValue;
-                }
-                else
-                {
-                    parentDetail = new Model.WBS_WorkPackageParentDetail();
-                    parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID();
-                    parentDetail.ParentId = SuperWorkPackageId;
-                    parentDetail.Months = months;
-                    parentDetail.ThisValue = thisValue;
-                    db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
-                }
-                if (workPackage.SuperWorkPackageId != null)   //还存在上级节点，需要继续循环
-                {
-                    UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue);
-                }
-            }
-        }
-        #endregion
-
         protected void btnSave_OnClick(object sender, EventArgs e)
         {
             JArray EditorArr = Grid1.GetMergedData();
@@ -285,7 +259,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     model.EstimatedQuantity = EstimatedQuantity;
                     model.EstimatedAmount = Funs.GetNewDecimal(EstimatedAmount);
                     model.SettledQuantity = SettledQuantity;
-                    model.SettledAmount = Funs.GetNewDecimal(SettledAmount);
+                    model.SettledAmount = Funs.GetNewDecimalOrZero(SettledQuantity)* Funs.GetNewDecimalOrZero(TotalCostFixedComprehensiveUnitPrice);
 
                     PhtglContractTrackService.UpdatePHTGL_ContractTrack(model);
                 }
@@ -302,6 +276,41 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             BindGrid();
         }
 
+        #region  更新上级WBS内容每月实际费用
+        /// <summary>
+        /// 更新上级WBS内容每月实际费用
+        /// </summary>
+        /// <param name="years"></param>
+        /// <param name="months"></param>
+        /// <param name="PlanNum"></param>
+        /// <param name="parentId"></param>
+        private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue)
+        {
+            Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
+            if (workPackage != null)
+            {
+                Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months);
+                if (parentDetail != null)
+                {
+                    parentDetail.ThisValue += thisValue;
+                }
+                else
+                {
+                    parentDetail = new Model.WBS_WorkPackageParentDetail();
+                    parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID();
+                    parentDetail.ParentId = SuperWorkPackageId;
+                    parentDetail.Months = months;
+                    parentDetail.ThisValue = thisValue;
+                    db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
+                }
+                if (workPackage.SuperWorkPackageId != null)   //还存在上级节点，需要继续循环
+                {
+                    UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue);
+                }
+            }
+        }
+        #endregion
+
         protected void btnQuery_OnClick(object sender, EventArgs e)
         {
             BindGrid();
@@ -400,33 +409,5 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             return sb.ToString();
         }
         #endregion
-
-        protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
-            {
-                var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
-                if (model != null)
-                {
-                    ContractId = model.ContractId;
-                    this.txtContractName.Text = model.ContractName;
-                }
-                else
-                {
-                    ContractId = "";
-                    this.txtContractName.Text = string.Empty;
-
-                }
-            }
-            BindGrid();
-        }
-
-
-        protected void Window3_OnClose(object sender, WindowCloseEventArgs e)
-        {
-            BindGrid2();
-        }
-
-
     }
 }

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs

@@ -356,6 +356,24 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.NumberBox NumberBox3;
 
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -401,15 +419,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.Window Window2;
 
-        /// <summary>
-        /// Window3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window Window3;
-
         /// <summary>
         /// Menu1 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx

@@ -48,7 +48,7 @@
                     <Items>
                         <f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" >
                         </f:TextBox>
-                        <f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" >
+                        <f:TextBox ID="txtSubItemProject" runat="server" Label="子分部工程" MaxLength="200" >
                         </f:TextBox>
                     </Items>
                 </f:FormRow> 
@@ -86,10 +86,10 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtTotalCostFixedComprehensiveUnitPrice" runat="server" Label="全费用固定综合单价" MaxLength="200">
+                        <f:TextBox ID="txtTotalCostFixedComprehensiveUnitPrice" runat="server" Label="全费用固定综合单价(元)" MaxLength="200">
                         </f:TextBox>
                         
-                        <f:TextBox ID="txtMainMaterialCost" runat="server" Label="主材费" MaxLength="200">
+                        <f:TextBox ID="txtMainMaterialCost" runat="server" Label="其中:主材费(元)" MaxLength="200">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
@@ -99,7 +99,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtTotalPrice" runat="server" Label="合价/元" MaxLength="200">
+                        <f:TextBox ID="txtTotalPrice" runat="server" Label="合价(元)" MaxLength="200">
                         </f:TextBox>
                         
                         <f:TextBox ID="txtCalculationRule" runat="server" Label="计算规则" MaxLength="200">
@@ -154,20 +154,20 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:NumberBox ID="txtEstimatedAmount" runat="server" Label="概算金额"
+                        <f:NumberBox ID="txtEstimatedAmount" runat="server" Label="概算金额(元)"
                             NoDecimal="false" DecimalPrecision="2" Increment="0.01">
                         </f:NumberBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtSettledQuantity" runat="server" Label="结算工程量" MaxLength="200">
+                        <f:TextBox ID="txtSettledQuantity" runat="server" Label="预算工程量" MaxLength="200">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:NumberBox ID="txtSettledAmount" runat="server" Label="结算金额" 
+                        <f:NumberBox ID="txtSettledAmount" runat="server" Label="预算金额(元)" 
                             NoDecimal="false" DecimalPrecision="2" Increment="0.01">
                         </f:NumberBox>
                     </Items>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx

@@ -150,19 +150,19 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
-                                    FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
-                                    FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
-                                    FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="合价(元)" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
                                     </Editor>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs

@@ -118,7 +118,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "BCWS_OutputValue";
                     bf.DataField = date + "BCWS_OutputValue";
-                    bf.HeaderText = "产值";
+                    bf.HeaderText = "产值(元)";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p1BCWS.Columns.Add(bf);
@@ -127,7 +127,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "BCWS_Percentage";
                     bf.DataField = date + "BCWS_Percentage";
-                    bf.HeaderText = "百分比";
+                    bf.HeaderText = "百分比/%";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p1BCWS.Columns.Add(bf);
@@ -150,7 +150,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "ACWP_OutputValue";
                     bf.DataField = date + "ACWP_OutputValue";
-                    bf.HeaderText = "产值";
+                    bf.HeaderText = "产值(元)";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p1ACWP.Columns.Add(bf);
@@ -159,7 +159,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "ACWP_Percentage";
                     bf.DataField = date + "ACWP_Percentage";
-                    bf.HeaderText = "百分比";
+                    bf.HeaderText = "百分比/%";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p1ACWP.Columns.Add(bf);
@@ -188,7 +188,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "SumBCWS_OutputValue";
                     bf.DataField = date + "SumBCWS_OutputValue";
-                    bf.HeaderText = "产值";
+                    bf.HeaderText = "产值(元)";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p2BCWS.Columns.Add(bf);
@@ -197,7 +197,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "SumBCWS_Percentage";
                     bf.DataField = date + "SumBCWS_Percentage";
-                    bf.HeaderText = "百分比";
+                    bf.HeaderText = "百分比/%";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p2BCWS.Columns.Add(bf);
@@ -220,7 +220,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "SumACWP_OutputValue";
                     bf.DataField = date + "SumACWP_OutputValue";
-                    bf.HeaderText = "产值";
+                    bf.HeaderText = "产值(元)";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p2ACWP.Columns.Add(bf);
@@ -229,7 +229,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     bf = new FineUIPro.BoundField();
                     bf.ColumnID = date + "SumACWP_Percentage";
                     bf.DataField = date + "SumACWP_Percentage";
-                    bf.HeaderText = "百分比";
+                    bf.HeaderText = "百分比/%";
                     bf.HeaderTextAlign = TextAlign.Center;
                     bf.TextAlign = TextAlign.Center;
                     p2ACWP.Columns.Add(bf);

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx

@@ -67,12 +67,10 @@
                                 </f:Toolbar>
                             </Toolbars>
                             <Columns>
-                                <%--<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                                <f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
-                                    TextAlign="Center">
+                                               FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
-                                    <ItemTemplate>
+   
-                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                </f:RenderField>
-                                    </ItemTemplate>
-                                </f:TemplateField>--%>
 
                                 <f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"  EnableColumnEdit="False"
                                     FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
@@ -142,7 +140,7 @@
                                     FieldType="String" HeaderText="权重" TextAlign="Left" HeaderTextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="WorkPackageEstimate" DataField="WorkPackageEstimate" FieldType="Double"
-                                    HeaderText="概算" HeaderTextAlign="Center">
+                                    HeaderText="概算(元)" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
                                         </f:NumberBox>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs

@@ -91,11 +91,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                        x.EstimatedAmount,
                        x.SettledQuantity,
                        x.SettledAmount,
-                       x.ContractId
+                       x.ContractId,
+                       x.SerialNumber
                     };
             ;
             Grid1.RecordCount = q.Count();
-            Grid1.DataSource = q.ToList();
+            Grid1.DataSource = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList();
             Grid1.DataBind();
           
         }

SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx

@@ -71,20 +71,23 @@
                             SortField="Weights" HeaderTextAlign="Center" TextAlign="Center" Width="80px"
                             FieldType="String">
                         </f:RenderField>
-                        <f:RenderField HeaderText="施工单位" ColumnID="UnitId" DataField="UnitId"
+                        <f:TemplateField ColumnID="UnitId" Width="150px" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Center">
-                            SortField="UnitId" HeaderTextAlign="Center" TextAlign="Center" Width="120px"
+                            <ItemTemplate>
-                            FieldType="String">
+                                <asp:Label ID="Label1" runat="server" Text='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("UnitId")) %>'></asp:Label>
-                        </f:RenderField>
+                            </ItemTemplate>
-                        <f:RenderField HeaderText="监理单位" ColumnID="SupervisorUnitId" DataField="SupervisorUnitId"
+                        </f:TemplateField>
-                            SortField="SupervisorUnitId" HeaderTextAlign="Center" TextAlign="Center" Width="120px"
+                        <f:TemplateField ColumnID="SupervisorUnitId" Width="150px" HeaderText="监理单位" HeaderTextAlign="Center" TextAlign="Center">
-                            FieldType="String">
+                            <ItemTemplate>
-                        </f:RenderField>
+                                <asp:Label ID="Label3" runat="server" Text='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("SupervisorUnitId")) %>'></asp:Label>
-                        <f:RenderField HeaderText="检测单位" ColumnID="NDEUnit" DataField="NDEUnit"
+                            </ItemTemplate>
-                            SortField="NDEUnit" HeaderTextAlign="Center" TextAlign="Center" Width="120px"
+                        </f:TemplateField>
-                            FieldType="String">
+                        <f:TemplateField ColumnID="NDEUnit" Width="150px" HeaderText="检测单位" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
+                            <ItemTemplate>
-                        <f:TemplateField ColumnID="MainItemAndDesignProfessionalIds" Width="150px" HeaderText="对应主项及设计专业" HeaderTextAlign="Center" TextAlign="Center"
+                                <asp:Label ID="Label4" runat="server" Text='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("NDEUnit")) %>'></asp:Label>
-                                    >
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         
+                        <f:TemplateField ColumnID="MainItemAndDesignProfessionalIds" Width="150px" HeaderText="对应主项及设计专业" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="Label2" runat="server" Text='<%# ConvertDesignProfessionalName(Eval("MainItemAndDesignProfessionalIds")) %>'></asp:Label>
                             </ItemTemplate>

SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs

@@ -57,10 +57,7 @@ namespace FineUIPro.Web.ProjectData
 
         protected DataTable ChecklistData()
         {
-            string strSql = @"select UnitWorkId,UnitWorkCode,UnitWorkName,Costs,Weights,MainItemAndDesignProfessionalIds,SuperUnitWork,(case IsChild when '1' then 'true' else 'false' end) isChild,(case ProjectType when '1' then '建筑工程' when '2' then '安装工程' else '' end ) ProjectType ,Unit.UnitName AS UnitId,SupervisorUnit.UnitName AS SupervisorUnitId,NDEUnit.UnitName AS NDEUnit from  [dbo].[WBS_UnitWork] AS UnitWork 
+            string strSql = @"select *  from [dbo].[WBS_UnitWork] AS UnitWork where ProjectId=@ProjectId ";
-              Left join Base_Unit AS Unit on UnitWork.UnitId=Unit.UnitId
-              Left join Base_Unit AS SupervisorUnit on UnitWork.SupervisorUnitId=SupervisorUnit.UnitId
-              Left join Base_Unit AS NDEUnit on UnitWork.NDEUnit=NDEUnit.UnitId where ProjectId=@ProjectId ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
+namespace FineUIPro.Web.ProjectData
+{
 
 
-    public partial class UnitWork {
+    public partial class UnitWork
+    {
 
         /// <summary>
         /// form1 控件。
@@ -120,6 +122,33 @@ namespace FineUIPro.Web.ProjectData {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
 
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
         /// <summary>
         /// Label2 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx

@@ -42,7 +42,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList runat="server" ID="drpUnit" Label="施工单位" LabelWidth="150px" ShowRedStar="true" EnableCheckBoxSelect="True"></f:DropDownList>
+                        <f:DropDownList runat="server" ID="drpUnit" Label="施工单位" LabelWidth="150px" ShowRedStar="true" EnableMultiSelect="true" EnableCheckBoxSelect="true" ></f:DropDownList>
                    </Items>
                 </f:FormRow>
                 <f:FormRow>