pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
5dcd07f256
commit
23ab10ded5
3 changed files with 19 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      BBWY.Client/Models/APIModel/Request/CerRequest.cs
  2. 11
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  3. 20
      BBWY.Client/Views/QualityTask/QualityWindow.xaml

3
BBWY.Client/Models/APIModel/Request/CerRequest.cs
View File

@ -71,5 +71,8 @@ namespace BBWY.Client.Models.APIModel.Request
public int GoodsNumber { get; set; } public int GoodsNumber { get; set; }
public string ProduceDate { get; set; } public string ProduceDate { get; set; }
public string PurchaseSkuId { get; set; }
} }
} }

11
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
View File

@ -281,19 +281,19 @@ namespace BBWY.Client.ViewModels
string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" }; string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" };
PackPurchaseTaskService packPurchaseTaskService; PackPurchaseTaskService packPurchaseTaskService;
PackTaskService packTaskService;
ProductService productService; ProductService productService;
GlobalContext globalContext; GlobalContext globalContext;
private bool isLoading = false; private bool isLoading = false;
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
#endregion #endregion
public QualityViewModel(ProductService productService, GlobalContext globalContext, PackPurchaseTaskService packPurchaseTaskService, PurchaseService purchaseService) public QualityViewModel(ProductService productService, GlobalContext globalContext, PackPurchaseTaskService packPurchaseTaskService, PurchaseService purchaseService, PackTaskService packTaskService)
{ {
this.packPurchaseTaskService = packPurchaseTaskService; this.packPurchaseTaskService = packPurchaseTaskService;
this.productService = productService; this.productService = productService;
this.globalContext = globalContext; this.globalContext = globalContext;
OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail); OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail);
SetBarCodeCommand = new RelayCommand(SetBarCode); SetBarCodeCommand = new RelayCommand(SetBarCode);
SetCertificateCommand = new RelayCommand<PurchaseSku>(SetCertificate); SetCertificateCommand = new RelayCommand<PurchaseSku>(SetCertificate);
@ -311,6 +311,7 @@ namespace BBWY.Client.ViewModels
} }
this.purchaseService = purchaseService; this.purchaseService = purchaseService;
this.packTaskService = packTaskService;
#if DEBUG #if DEBUG
//Test(); //Test();
@ -364,7 +365,7 @@ namespace BBWY.Client.ViewModels
BarCodeModel.BrandName = BrandName; BarCodeModel.BrandName = BrandName;
SetBarCodeWindow setBarCodeWindow = new SetBarCodeWindow(); SetBarCodeWindow setBarCodeWindow = new SetBarCodeWindow();
setBarCodeWindow.LoadData(BarCodeModel, packPurchaseTaskService); setBarCodeWindow.LoadData(BarCodeModel, packTaskService);
setBarCodeWindow.SaveResult = b => setBarCodeWindow.SaveResult = b =>
{ {
BarCodeModel = b; BarCodeModel = b;
@ -413,7 +414,7 @@ namespace BBWY.Client.ViewModels
/// </summary> /// </summary>
private void LookCer(string id) private void LookCer(string id)
{ {
LookCerWindow lookCerWindow = new LookCerWindow(PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == id).CerDTO); QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == id).CerDTO);
lookCerWindow.Show(); lookCerWindow.Show();
} }
/// <summary> /// <summary>

20
BBWY.Client/Views/QualityTask/QualityWindow.xaml
View File

@ -13,7 +13,7 @@
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0" RightButtonGroupMargin="0,5,5,0"
Height="450" Width="1305"> Height="800" Width="1305">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
@ -131,7 +131,7 @@
<StackPanel Orientation="Horizontal" Margin="0 30 0 0"> <StackPanel Orientation="Horizontal" Margin="0 30 0 0">
<TextBlock VerticalAlignment="Center"> <TextBlock VerticalAlignment="Center">
<Run Text="份数:"/> <Run Text="份数:"/>
<Run Text="10"/> <Run Text="1"/>
</TextBlock> </TextBlock>
<UniformGrid Columns="3" Margin="45 0 0 0" Height="30"> <UniformGrid Columns="3" Margin="45 0 0 0" Height="30">
<TextBlock Text="预计完成时间: " VerticalAlignment="Center"/> <TextBlock Text="预计完成时间: " VerticalAlignment="Center"/>
@ -155,19 +155,19 @@
</StackPanel> </StackPanel>
<c:BTextBox WaterRemark="打包备注" Grid.Column="1" Margin="0 5 10 5" Height="80"/> <c:BTextBox WaterRemark="打包备注" Grid.Column="1" Margin="0 5 10 5" Height="80"/>
</Grid> </Grid>
<Grid Width="auto" Height="90" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="20 10 0 0"> <Grid Width="auto" Height="90" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="20 10 0 0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Height="1" VerticalAlignment="Top" BorderBrush="{StaticResource Border.Brush}" Grid.Row="0"/> <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
<Border Height="1" VerticalAlignment="Top" BorderBrush="{StaticResource Border.Brush}" Grid.Row="1"/> <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.Row="1"/>
<Border Height="1" VerticalAlignment="Top" BorderBrush="{StaticResource Border.Brush}" Grid.Row="2"/> <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.Row="2"/>
<Border Height="1" VerticalAlignment="Bottom" BorderBrush="{StaticResource Border.Brush}" Grid.Row="2"/> <Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}" Grid.Row="2"/>
<Border Width="1" HorizontalAlignment="Left" BorderBrush="{StaticResource Border.Brush}" Grid.RowSpan="3"/> <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.RowSpan="3"/>
<Border Width="1" HorizontalAlignment="Right" BorderBrush="{StaticResource Border.Brush}" Grid.RowSpan="3"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.RowSpan="3"/>
<TextBlock Grid.Row="0" Text="第1份" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Grid.Row="0" Text="第1份" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Grid.Row="1" Text="10" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Grid.Row="1" Text="10" HorizontalAlignment="Center" VerticalAlignment="Center"/>
@ -183,7 +183,7 @@
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}" ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}"
BorderBrush="{StaticResource Border.Brush}" BorderBrush="{StaticResource Border.Brush}"
BorderThickness="0" BorderThickness="0"
Foreground="{StaticResource Text.Color}"> Foreground="{StaticResource Text.Color}">
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>

Write Preview
Loading…
Cancel
Save