feat: 完善材料管理与焊接业务功能

SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx

@@ -70,6 +70,9 @@
                         <f:RenderField Width="90px" ColumnID="MaterialUnit" DataField="MaterialUnit" FieldType="String" HeaderText="单位"
                             HeaderTextAlign="Center" TextAlign="Left" SortField="MaterialUnit" >
                         </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="DesignInstitute" DataField="DesignInstitute" FieldType="String" HeaderText="所属设计院"
+                            HeaderTextAlign="Center" TextAlign="Left" SortField="DesignInstitute">
+                        </f:RenderField>
                         <f:RenderField Width="260px" ColumnID="MaterialDef" DataField="MaterialDef" FieldType="String"
                             HeaderText="材料描述" HeaderTextAlign="Center" TextAlign="Left"
                             ExpandUnusedSpace="true">

SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx

@@ -55,13 +55,20 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
-             <f:FormRow>
+            <f:FormRow>
                 <Items>
                      <f:TextBox ID="txtMaterialUnit" runat="server" Label="单位"
                          LabelWidth="100px">
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                     <f:TextBox ID="txtDesignInstitute" runat="server" Label="所属设计院"
+                         MaxLength="200" LabelWidth="100px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:TextArea ID="txtMaterialDef" runat="server" Label="描述" MaxLength="300" LabelWidth="100px">

SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs

@@ -31,6 +31,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                         txtMaterialSpec.Text = lib.MaterialSpec;
                         txtMaterialDef.Text = lib.MaterialDef;
                         txtMaterialUnit.Text = lib.MaterialUnit;
+                        txtDesignInstitute.Text = lib.DesignInstitute;
                         //txtMaterialCode.Enabled = false;
                     }
                     else
@@ -71,7 +72,10 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                 MaterialMade = this.txtMaterialMade.Text.Trim(),
                 MaterialDef = this.txtMaterialDef.Text.Trim(),
                 MaterialUnit = txtMaterialUnit.Text.Trim(),
-                Code = this.txtCode.Text.Trim()
+                Code = this.txtCode.Text.Trim(),
+                DesignInstitute = string.IsNullOrWhiteSpace(txtDesignInstitute.Text)
+                    ? null
+                    : txtDesignInstitute.Text.Trim()
             };
 
             if (!string.IsNullOrEmpty(materialCode))
@@ -91,4 +95,4 @@ namespace FineUIPro.Web.HJGL.BaseInfo
         }
         #endregion
     }
-}
+}

SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs

@@ -101,6 +101,11 @@ namespace FineUIPro.Web.HJGL.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMaterialUnit;
+
+        /// <summary>
+        /// txtDesignInstitute 控件。
+        /// </summary>
+        protected global::FineUIPro.TextBox txtDesignInstitute;
         
         /// <summary>
         /// txtMaterialDef 控件。

SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs

@@ -153,6 +153,9 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                 // item.MaterialMade = dv[i]["材质"].ToString();
                 item.MaterialUnit = rows[i].MaterialUnit;
                 item.MaterialName = rows[i].MaterialName;
+                item.DesignInstitute = string.IsNullOrWhiteSpace(rows[i].DesignInstitute)
+                    ? null
+                    : rows[i].DesignInstitute.Trim();
                 //item.PipeGrade = dv[i]["管道等级"].ToString();
                 //item.ProjectId = CurrUser.LoginProjectId;
                 //= SQLHelper.GetNewID(typeof(Model.Editor_CostReport));
@@ -236,6 +239,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                            MaterialSpec = x.MaterialSpec,
                            MaterialUnit = x.MaterialUnit,
                            MaterialName = x.MaterialName,
+                           DesignInstitute = x.DesignInstitute,
 
                        }).DistinctBy(temp => new
                        {
@@ -243,7 +247,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                            temp.MaterialDef,
                            temp.MaterialSpec,
                            temp.MaterialUnit,
-                           temp.MaterialName
+                           temp.MaterialName,
+                           temp.DesignInstitute
                        }).ToList();
             codeLib_update = (from x in codeLib_update
                               select new HJGL_MaterialCodeLib
@@ -253,6 +258,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                                   MaterialSpec = x.MaterialSpec,
                                   MaterialUnit = x.MaterialUnit,
                                   MaterialName = x.MaterialName,
+                                  DesignInstitute = x.DesignInstitute,
 
                               }).DistinctBy(temp => new
                               {
@@ -260,7 +266,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                                   temp.MaterialDef,
                                   temp.MaterialSpec,
                                   temp.MaterialUnit,
-                                  temp.MaterialName
+                                  temp.MaterialName,
+                                  temp.DesignInstitute
                               }).ToList();
             foreach (var item in codeLib_update)
             {
@@ -281,4 +288,4 @@ namespace FineUIPro.Web.HJGL.BaseInfo
         }
         #endregion
     }
-}
+}