baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-人工叫料界面materiald替换成materialCode

Browse Source
master
liuwf 1 year ago
parent ba42901258
commit 9522a33f90
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File

14
src/Khd.Core.Wpf/Form/FormBoardT.xaml
Unescape Escape View File

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

4
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
Unescape Escape View File

@ -2035,7 +2035,7 @@ namespace Khd.Core.Wpf.Form
palletInfoCode = t.Key.palletInfoCode, palletInfoCode = t.Key.palletInfoCode,
totalAmount = t.Sum(x => x.totalAmount), totalAmount = t.Sum(x => x.totalAmount),
frozenAmount = t.Sum(x => x.frozenAmount), frozenAmount = t.Sum(x => x.frozenAmount),
}); });
//.GroupBy(t => t.palletInfoCode) //.GroupBy(t => t.palletInfoCode)
//.Select(t => new //.Select(t => new
//{ //{
@ -2065,6 +2065,7 @@ namespace Khd.Core.Wpf.Form
materialId = b.materialId, materialId = b.materialId,
materialName = c.MaterialName, materialName = c.MaterialName,
materialSpec = c.MaterialSpec, materialSpec = c.MaterialSpec,
materialCode = c.MaterialCode,
palletInfoCode = b.palletInfoCode, palletInfoCode = b.palletInfoCode,
//instockDate = b.instockDate, //instockDate = b.instockDate,
totalAmount = b.totalAmount, totalAmount = b.totalAmount,
@ -2081,6 +2082,7 @@ namespace Khd.Core.Wpf.Form
totalAmount = string.Join("\n", t.Select(x => x.totalAmount)), totalAmount = string.Join("\n", t.Select(x => x.totalAmount)),
frozenAmount = string.Join("\n", t.Select(x => x.frozenAmount)), frozenAmount = string.Join("\n", t.Select(x => x.frozenAmount)),
materialId = string.Join("\n", t.Select(x => x.materialId)), 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)])), 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)), 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)])), materialSpec = string.Join("\n", t.Select(x => x.materialSpec[..(x.materialSpec.Length > 20 ? 20 : x.materialSpec.Length)])),

Write Preview
Loading…
Cancel
Save