diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml index e7af08a..56ad142 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml @@ -1640,7 +1640,7 @@ @@ -1675,7 +1675,7 @@ diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs index 372d4de..517630a 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs @@ -2035,7 +2035,7 @@ namespace Khd.Core.Wpf.Form palletInfoCode = t.Key.palletInfoCode, totalAmount = t.Sum(x => x.totalAmount), frozenAmount = t.Sum(x => x.frozenAmount), - }); + }); //.GroupBy(t => t.palletInfoCode) //.Select(t => new //{ @@ -2065,6 +2065,7 @@ namespace Khd.Core.Wpf.Form materialId = b.materialId, materialName = c.MaterialName, materialSpec = c.MaterialSpec, + materialCode = c.MaterialCode, palletInfoCode = b.palletInfoCode, //instockDate = b.instockDate, totalAmount = b.totalAmount, @@ -2081,6 +2082,7 @@ namespace Khd.Core.Wpf.Form totalAmount = string.Join("\n", t.Select(x => x.totalAmount)), frozenAmount = string.Join("\n", t.Select(x => x.frozenAmount)), materialId = string.Join("\n", t.Select(x => x.materialId)), + materialCode = string.Join("\n", t.Select(x => x.materialCode)), materialName = string.Join("\n", t.Select(x => x.materialName[..(x.materialName.Length > 20 ? 20 : x.materialName.Length)])), materialNameSrc = string.Join("\n", t.Select(x => x.materialName)), materialSpec = string.Join("\n", t.Select(x => x.materialSpec[..(x.materialSpec.Length > 20 ? 20 : x.materialSpec.Length)])),