Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -37,7 +37,7 @@
     <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>3</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

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

@@ -21,6 +21,10 @@
                             <f:ListItem  Text="补充导入"  Value="0"/>
                             <f:ListItem  Text="更新导入"  Value="1"/>
                         </f:DropDownList>
+                        <f:RadioButtonList ID="rbDiaType" Label="DN公称直径/外径" runat="server">
+                            <f:RadioItem Text="DN公称直径" Value="0"  Selected="true"/>
+                            <f:RadioItem Text="外径" Value="1" />
+                        </f:RadioButtonList>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:HiddenField ID="hdFileName" runat="server">
                         </f:HiddenField>
@@ -57,9 +61,9 @@
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" Height="350px"
                             EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true"
-                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode"
+                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" EnableBigData="true"
                             AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
-                            AllowPaging="true" IsDatabasePaging="true" PageSize="15" 
+                            AllowPaging="true" IsDatabasePaging="false" PageSize="300" EnableBigDataRowTip="false"
                             EnableTextSelection="True" >
                             <Columns>
                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"

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

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

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

@@ -221,10 +221,14 @@
                                                             SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
                                                             Width="90px">
                                                         </f:RenderField>
-                                                        <f:RenderField HeaderText="外径（公称直径）" ColumnID="Dia"
+                                                        <f:RenderField HeaderText="外径" ColumnID="Dia"
                                                             DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
                                                             Width="90px">
                                                         </f:RenderField>
+                                                        <f:RenderField HeaderText="DN公称直径" ColumnID="DNDia"
+                                                            DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                                                            Width="90px">
+                                                        </f:RenderField>
                                                         <f:RenderField HeaderText="壁厚" ColumnID="Thickness"
                                                             DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
                                                             TextAlign="Left" Width="90px">

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

@@ -297,7 +297,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             string strSql = @"SELECT WeldJointId,JointAttribute,WeldJointCode,PipelineId,PipelineCode,JointAttribute,
                                      IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode,
-                                     Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode,
+                                     Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode,
                                      WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
                                      BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark
                               FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";