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

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
     }
-}
+}