Browse Source

修改白条收货头和片的选中

master
wangshaoyang 6 years ago
parent
commit
f19b45ad52
3 changed files with 11 additions and 3 deletions
  1. +2
    -0
      B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreConfig.cs
  2. +2
    -2
      B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml
  3. +7
    -1
      B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs

+ 2
- 0
B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreConfig.cs View File

@ -16,5 +16,7 @@ namespace B3DealerClient.Windows.CarcassInStoreWindow_
public decimal? HookWeight { get; set; } public decimal? HookWeight { get; set; }
public decimal? Pics { get; set; } public decimal? Pics { get; set; }
public bool? IsPic { get; set; }
} }
} }

+ 2
- 2
B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml View File

@ -56,7 +56,7 @@
<TextBlock Text="扣钩重:"/> <TextBlock Text="扣钩重:"/>
<TextBox x:Name="hook" Text="{Binding HookWeight,StringFormat=\{0:0.######\}}" PreviewMouseDown="NumberBox_PreviewMouseDown"/> <TextBox x:Name="hook" Text="{Binding HookWeight,StringFormat=\{0:0.######\}}" PreviewMouseDown="NumberBox_PreviewMouseDown"/>
</WrapPanel> </WrapPanel>
<local:SwitchCheckBox x:Name="weightUnit" Grid.Row="1" HorizontalAlignment="Right" Text="头" CheckedText="片" Width="120" Margin="10,0"/>
<local:SwitchCheckBox x:Name="weightUnit" Grid.Row="1" HorizontalAlignment="Right" Text="头" CheckedText="片" Width="120" Margin="10,0" Click="weightUnit_Click"/>
<WrapPanel Grid.Column="1" HorizontalAlignment="Center" Margin="0,5"> <WrapPanel Grid.Column="1" HorizontalAlignment="Center" Margin="0,5">
<TextBlock Text="供应商:"/> <TextBlock Text="供应商:"/>
<TextBlock Text="{Binding Dmo.Supplier_Name}" Width="200" TextWrapping="Wrap" Margin="0,0,10,0" Foreground="Red"/> <TextBlock Text="{Binding Dmo.Supplier_Name}" Width="200" TextWrapping="Wrap" Margin="0,0,10,0" Foreground="Red"/>
@ -257,7 +257,7 @@
<Button Content="删除选中" Style="{StaticResource deleteBtn}" IsEnabled="{Binding Receive ,Converter={StaticResource NullIsFalseConverter}}" PreviewMouseDown="DeleteBtn_PreviewMouseDown"/> <Button Content="删除选中" Style="{StaticResource deleteBtn}" IsEnabled="{Binding Receive ,Converter={StaticResource NullIsFalseConverter}}" PreviewMouseDown="DeleteBtn_PreviewMouseDown"/>
<TextBlock Text="件数录入:" VerticalAlignment="Center"/> <TextBlock Text="件数录入:" VerticalAlignment="Center"/>
<TextBox x:Name="pics" Text="{Binding Pics,StringFormat=\{0:0.######\}}" Margin="10,0" PreviewMouseDown="NumberBox_PreviewMouseDown"/> <TextBox x:Name="pics" Text="{Binding Pics,StringFormat=\{0:0.######\}}" Margin="10,0" PreviewMouseDown="NumberBox_PreviewMouseDown"/>
<Button Content="确认" IsEnabled="{Binding CanSave}" PreviewMouseDown="SaveBtn_PreviewMouseDown"/>
<Button Content="确认" IsEnabled="{Binding CanSave}" PreviewMouseDown="SaveBtn_PreviewMouseDown"/>
</WrapPanel> </WrapPanel>
</Grid> </Grid>
</Border> </Border>


+ 7
- 1
B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml.cs View File

@ -60,6 +60,7 @@ namespace B3DealerClient.Windows.CarcassInStoreWindow_
if (config.InStore != null) if (config.InStore != null)
context.InStore = config.InStore; context.InStore = config.InStore;
context.HookWeight = config.HookWeight; context.HookWeight = config.HookWeight;
weightUnit.IsChecked = config.IsPic;
context.Pics = config.Pics; context.Pics = config.Pics;
} }
@ -249,7 +250,6 @@ namespace B3DealerClient.Windows.CarcassInStoreWindow_
RecordSelected(); RecordSelected();
weightControl.Weight = 0; weightControl.Weight = 0;
context.Weight = 0; context.Weight = 0;
CarcassInStoreConfigPrint.Print(record,context.Supplier.Name); CarcassInStoreConfigPrint.Print(record,context.Supplier.Name);
} }
@ -267,5 +267,11 @@ namespace B3DealerClient.Windows.CarcassInStoreWindow_
var id = CarcassInStoreBL.FinishInStore(context.Dmo.ID, context.InStore.ID); var id = CarcassInStoreBL.FinishInStore(context.Dmo.ID, context.InStore.ID);
MessageBox.Show("生成采购收货单No." + id); MessageBox.Show("生成采购收货单No." + id);
} }
private void weightUnit_Click(object sender, RoutedEventArgs e)
{
config.IsPic = weightUnit.IsChecked;
XmlUtil.SerializerObjToFile(config);
}
} }
} }

Loading…
Cancel
Save