1

BBWY.Client/Helpers/MyPrintHelper.cs

@@ -220,7 +220,7 @@ namespace BBWY.Client.Helpers
             args.Graphics.DrawString($"材质: {certificate.Shader}", font, System.Drawing.Brushes.Black, new PointF(122, verHeight));
 
             StringBuilder sb = new StringBuilder();
-            var excutes = certificate.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
+            var excutes = certificate.ExcuteStander.Split(new string[] { ",", "，" }, StringSplitOptions.RemoveEmptyEntries);
             int hangCount = excutes.Count() / 2 + excutes.Count() % 2;//获取行数 
 
             for (int i = 0; i < excutes.Count(); i++)
@@ -307,7 +307,7 @@ namespace BBWY.Client.Helpers
             //args.Graphics.DrawString($"材质: {certificate.Shader}", font, System.Drawing.Brushes.Black, new PointF(122, verHeight));
 
             StringBuilder sb = new StringBuilder();
-            var excutes = certificate.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
+            var excutes = certificate.ExcuteStander.Split(new string[] { ",", "，" }, StringSplitOptions.RemoveEmptyEntries);
             int hangCount = excutes.Count() / 2 + excutes.Count() % 2;//获取行数 
             for (int i = 0; i < excutes.Count(); i++)
             {

BBWY.Client/Models/PackTask/CertificateModel.cs

@@ -115,9 +115,9 @@ namespace BBWY.Client.Models
         void GetExcuteStanderFormat()
         {
             StringBuilder sb = new StringBuilder();
-            if (this.ExcuteStander.Contains(","))//有逗号就拆分
+            if (this.ExcuteStander.Contains(",")|| this.ExcuteStander.Contains("，"))//有逗号就拆分
             {
-                var excutes = this.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
+                var excutes = this.ExcuteStander.Split(new string[] { ",", "，" }, StringSplitOptions.RemoveEmptyEntries);
                 for (int i = 0; i < excutes.Length; i++)
                 {
                     if (i % 2 == 0 && i > 0)//间隔两个换行

BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@@ -747,7 +747,6 @@ namespace BBWY.Client.ViewModels.PackTask
                 new TipsWindow("参数出错!请重新填写!").Show();
                 return;
             }
-            var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
            
             var resData = packTaskService.SaveCer(new CerRequest
             {
@@ -755,7 +754,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 BrandName = CertificateModel.BrandName,
                 ProductNo = CertificateModel.ProductNo,
                 SkuId = CertificateModel.SkuId,
-                ExcuteStander = CertificateModel.ExcuteStander,
+                ExcuteStander = CertificateModel.ExcuteStander.Replace("，",","),
                 LabelModel = (int)CertificateModel.LabelModel,
                 FactoryNumber = CertificateModel.FactoryNumber,
                 IsLogo = CertificateModel.IsLogo,

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10096" Margin="5,0,0,0"/>
+                <TextBlock Text="v10098" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Client/Views/PackTask/LookCerWindow.xaml

@@ -76,7 +76,7 @@
                     <TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
                     <TextBox IsReadOnly="True"   BorderBrush="Transparent"  
                                  TextWrapping ="Wrap" AcceptsReturn="True"
-                                 Height="50" Text="{Binding ExcuteStanderFormatFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
+                                 Height="50" Text="{Binding ExcuteStanderFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
 
                     <TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
                     <c:BTextBox  IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>