From 9522a33f9027e64895558ffdc604e008ecff498a Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 15:17:29 +0800
Subject: [PATCH] =?UTF-8?q?change-=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2materiald=E6=9B=BF=E6=8D=A2=E6=88=90materialC?=
 =?UTF-8?q?ode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 14 +++++++-------
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

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 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 <DataGridTextColumn
-                                                    Width="180*"
+                                                    Width="200*"
                                                     Binding="{Binding locationCode}"
                                                     CanUserSort="False"
                                                     ElementStyle="{StaticResource dgCell}"
@@ -1648,7 +1648,7 @@
                                                     Header="库位号"
                                                     IsReadOnly="True" />
                                                 <DataGridTextColumn
-                                                    Width="180*"
+                                                    Width="200*"
                                                     Binding="{Binding palletInfoCode}"
                                                     CanUserSort="False"
                                                     ElementStyle="{StaticResource dgCell}"
@@ -1656,15 +1656,15 @@
                                                     Header="料箱号"
                                                     IsReadOnly="True" />
                                                 <DataGridTextColumn
-                                                     Width="180*"
-                                                     Binding="{Binding materialId}"
+                                                     Width="200*"
+                                                     Binding="{Binding materialCode}"
                                                      CanUserSort="False"
                                                      ElementStyle="{StaticResource dgCell}"
                                                      FontSize="20"
-                                                     Header="物料Id"
+                                                     Header="物料编码"
                                                      IsReadOnly="True" />
                                                 <DataGridTemplateColumn
-                                                        Width="350*"
+                                                        Width="280*"
                                                         CanUserSort="False"
                                                         Header="物料名称"
                                                         IsReadOnly="True" >
@@ -1675,7 +1675,7 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 <DataGridTemplateColumn
-                                                   Width="350*"
+                                                   Width="300*"
                                                    CanUserSort="False"
                                                    Header="物料规格"
                                                    IsReadOnly="True" >
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)])),