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

1

qianyi
连坤 林 3 years ago
parent
11b65f15b4
commit
84e4b5aa3e
5 changed files with 25 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      BBWY.Client/Models/Enums.cs
  2. 11
      BBWY.Client/Models/PackTask/BarCodeModel.cs
  3. 26
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  4. 5
      BBWY.Client/Views/PackTask/SetBarCode.xaml
  5. 7
      BBWY.Client/Views/PackTask/SetCerWindow.xaml

18
BBWY.Client/Models/Enums.cs
View File

@ -288,22 +288,8 @@
/// </summary>
public enum CertificateLabelModel
{
/// <summary>
/// 合格证-标准单行
/// </summary>
CerStanderSingle = 0,
/// <summary>
/// 合格证-标准双行
/// </summary>
CerStanderDouble = 1,
/// <summary>
/// 合格证 3C 单行
/// </summary>
Cer3CSingle = 2,
/// <summary>
/// 合格证 3C 双行
/// </summary>
Cer3CDouble = 3,
No3C = 0,
Is3C = 1
}
/// <summary>
/// 合格证是否3c

11
BBWY.Client/Models/PackTask/BarCodeModel.cs
View File

@ -1,4 +1,6 @@
namespace BBWY.Client.Models
using BBWY.Client.Models.PackTask;
namespace BBWY.Client.Models
{
/// <summary>
/// 条形码
@ -51,10 +53,13 @@
/// </summary>
public string ModelNo { get => modelNo; set { Set(ref modelNo, value); } }
private BarcodeLabelModel labelModel= BarcodeLabelModel.barsimplify;
/// <summary>
/// 模板标签
/// </summary>
public BarcodeLabelModel LabelModel { get; set; }
public BarcodeLabelModel LabelModel { get => labelModel; set { Set(ref labelModel, value); } }
}
}

26
BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
View File

@ -375,7 +375,7 @@ namespace BBWY.Client.ViewModels.PackTask
SkuName = string.Empty;
ProductNo = string.Empty;
Brand = string.Empty;
brandName = string.Empty;
BrandName = string.Empty;
this.MarkMessage = "";
IsSetBarCode = true;
IsSetCertificate = true;
@ -612,29 +612,19 @@ namespace BBWY.Client.ViewModels.PackTask
return;
}
var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
CertificateLabelModel labelModel = CertificateLabelModel.CerStanderSingle;
bool IsTwo = false;
CertificateLabelModel labelModel = CertificateLabelModel.No3C;
if (standers.Count() > 2)
{
IsTwo = true;
}
switch (CertificateModel.IsLogo)
{
case 0://没图
if (IsTwo)
{
labelModel = CertificateLabelModel.CerStanderDouble; break;
}
labelModel = CertificateLabelModel.CerStanderSingle;
break;
labelModel = CertificateLabelModel.No3C; break;
case 1://含3c图
if (IsTwo)
{
labelModel = CertificateLabelModel.Cer3CDouble; break;
}
labelModel = CertificateLabelModel.Cer3CSingle;
labelModel = CertificateLabelModel.Is3C;
break;
default:
break;

5
BBWY.Client/Views/PackTask/SetBarCode.xaml
View File

@ -36,7 +36,8 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" >
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource objConverter},ConverterParameter=barsimplify:true:false }" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.barsimplify}" Content="精简" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<!--{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}-->
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.barsimplify}}" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.barsimplify}" Content="精简" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" >
@ -64,7 +65,7 @@
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" >
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource objConverter},ConverterParameter=barstander:true:false }" Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.barstander}" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.barstander}}" Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.barstander}" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" >

7
BBWY.Client/Views/PackTask/SetCerWindow.xaml
View File

@ -37,8 +37,8 @@
</Grid.ColumnDefinitions>
<Grid >
<!--CommandParameter="{x:Static cmodel:CerHave3C.No3C}"-->
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CerHave3C.No3C}" Content="标准" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}"-->
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.No3C}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CerHave3C.No3C}" Content="标准" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
@ -63,7 +63,8 @@
</Grid>
<Grid Grid.Column="1" >
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CerHave3C.Is3C}" Content="带3c标" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}"-->
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.Is3C}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CerHave3C.Is3C}" Content="带3c标" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />

Write Preview
Loading…
Cancel
Save