diff --git a/BBWY.Client/Helpers/MyPrintHelper.cs b/BBWY.Client/Helpers/MyPrintHelper.cs index a08317e2..1fc86a16 100644 --- a/BBWY.Client/Helpers/MyPrintHelper.cs +++ b/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++) { diff --git a/BBWY.Client/Models/PackTask/CertificateModel.cs b/BBWY.Client/Models/PackTask/CertificateModel.cs index b34b3d36..794898cf 100644 --- a/BBWY.Client/Models/PackTask/CertificateModel.cs +++ b/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)//间隔两个换行 diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs index 28106afe..70f9d939 100644 --- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs @@ -747,15 +747,14 @@ namespace BBWY.Client.ViewModels.PackTask new TipsWindow("参数出错!请重新填写!").Show(); return; } - var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries); - + var resData = packTaskService.SaveCer(new CerRequest { Brand = CertificateModel.Brand, 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, diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index c37d1d7e..05fd1730 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/BBWY.Client/Views/PackTask/LookCerWindow.xaml b/BBWY.Client/Views/PackTask/LookCerWindow.xaml index 5dc12ba4..082d697a 100644 --- a/BBWY.Client/Views/PackTask/LookCerWindow.xaml +++ b/BBWY.Client/Views/PackTask/LookCerWindow.xaml @@ -76,7 +76,7 @@ + Height="50" Text="{Binding ExcuteStanderFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>