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

2026-08-12 23:10:22 +08:00
parent 5d0501806b
commit 67206a28ee
26 changed files with 800 additions and 814 deletions
@@ -497,6 +497,7 @@ namespace BLL
                                             x.MaterialCode2,
                                             x.Number,
                                             w.WeldJointId,
+                                             w.WeldJointCode,
                                             w.Size,
                                             w.WeldingDailyId
                                         }).ToList();
@@ -528,16 +529,22 @@ namespace BLL
                        var materialGroups = componentMaterialRows
                            .Select(x => new
                            {
+                                WeldJointId = x.WeldJointId,
+                                WeldJointCode = x.WeldJointCode,
+                                WeldJointDin = x.Size ?? 0,
                                MaterialCode = GetExportMaterialCode(x.MaterialCode, x.MaterialCode2, materialCodeLibByMaterialCode),
                                Quantity = x.Number ?? 0
                            })
                            .Where(x => !string.IsNullOrEmpty(x.MaterialCode))
-                            .GroupBy(x => x.MaterialCode)
-                            .OrderBy(x => x.Key)
+                            .GroupBy(x => new { x.MaterialCode, x.WeldJointId, x.WeldJointCode, x.WeldJointDin })
+                            .OrderBy(x => x.Key.WeldJointCode)
+                            .ThenBy(x => x.Key.MaterialCode)
                            .Select(x => new
                            {
-                                MaterialCode = x.Key,
-                                Quantity = x.Sum(y => y.Quantity)
+                                MaterialCode = x.Key.MaterialCode,
+                                Quantity = x.Sum(y => y.Quantity),
+                                WeldJointCode = x.Key.WeldJointCode,
+                                WeldJointDin = x.Key.WeldJointDin
                            })
                            .ToList();
                        return new Tw_PartialWeldedComponentOutput
@@ -555,6 +562,8 @@ namespace BLL
                            UnweldedDin = weldJoints
                                .Where(x => string.IsNullOrEmpty(x.WeldingDailyId))
                                .Sum(x => x.Size ?? 0),
+                            WeldJointCode = string.Join("\n", materialGroups.Select(x => x.WeldJointCode)),
+                            WeldJointDin = string.Join("\n", materialGroups.Select(x => x.WeldJointDin.ToString())),
                            MaterialCode = string.Join("\n", materialGroups.Select(x => x.MaterialCode)),
                            MaterialQuantity = string.Join("\n", materialGroups.Select(x => x.Quantity.ToString()))
                        };