feat: 完善材料条码与焊接业务功能

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

@@ -757,7 +757,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 List<string> materialCodes = SplitExportValues(x.MaterialCode);
                 List<string> materialQuantities = SplitExportValues(x.MaterialQuantity);
-                int materialRowCount = Math.Max(materialCodes.Count, materialQuantities.Count);
+                List<string> weldJointCodes = SplitExportValues(x.WeldJointCode);
+                List<string> weldJointDins = SplitExportValues(x.WeldJointDin);
+                int materialRowCount = new[]
+                {
+                    materialCodes.Count,
+                    materialQuantities.Count,
+                    weldJointCodes.Count,
+                    weldJointDins.Count
+                }.Max();
                 if (materialRowCount == 0)
                 {
                     materialRowCount = 1;
@@ -773,6 +781,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     已焊口数 = x.WeldedWeldJointCount,
                     未焊口数 = x.UnweldedWeldJointCount,
                     未焊达因量 = x.UnweldedDin ?? 0,
+                    焊口号 = index < weldJointCodes.Count ? weldJointCodes[index] : string.Empty,
+                    焊口达因 = index < weldJointDins.Count ? weldJointDins[index] : string.Empty,
                     材料编码 = index < materialCodes.Count ? materialCodes[index] : string.Empty,
                     数量 = index < materialQuantities.Count ? materialQuantities[index] : string.Empty,
                     组件匹配率 = x.ComponentMatchRateString,
@@ -814,7 +824,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             return string.IsNullOrEmpty(values)
                 ? new List<string>()
-                : values.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries)
+                : values.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None)
                     .Select(x => x.Trim())
                     .ToList();
         }