From 84e4b5aa3ed8e864f4cc772485e863038485dc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=9E=E5=9D=A4=20=E6=9E=97?= <506583276@qq.com>
Date: Tue, 28 Mar 2023 17:23:54 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Models/Enums.cs                   | 18 ++-----------
 BBWY.Client/Models/PackTask/BarCodeModel.cs   | 11 +++++---
 .../PackTask/CreatePackTaskViewModel.cs       | 26 ++++++-------------
 BBWY.Client/Views/PackTask/SetBarCode.xaml    |  5 ++--
 BBWY.Client/Views/PackTask/SetCerWindow.xaml  |  7 ++---
 5 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index c70614d1..61cdaa35 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -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
diff --git a/BBWY.Client/Models/PackTask/BarCodeModel.cs b/BBWY.Client/Models/PackTask/BarCodeModel.cs
index add20cfb..e3be4454 100644
--- a/BBWY.Client/Models/PackTask/BarCodeModel.cs
+++ b/BBWY.Client/Models/PackTask/BarCodeModel.cs
@@ -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); } }
     }
 }
diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
index 228223ec..25ef9168 100644
--- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
@@ -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;
diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml b/BBWY.Client/Views/PackTask/SetBarCode.xaml
index d310afd6..0ea7376a 100644
--- a/BBWY.Client/Views/PackTask/SetBarCode.xaml
+++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml
@@ -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"  >
 
diff --git a/BBWY.Client/Views/PackTask/SetCerWindow.xaml b/BBWY.Client/Views/PackTask/SetCerWindow.xaml
index ce3b8904..21e3555b 100644
--- a/BBWY.Client/Views/PackTask/SetCerWindow.xaml
+++ b/BBWY.Client/Views/PackTask/SetCerWindow.xaml
@@ -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" />