From d111b09af6e18d5a109d8273882e2a6bf86910cb Mon Sep 17 00:00:00 2001 From: mahao Date: Tue, 5 Sep 2023 13:40:01 +0800 Subject: [PATCH] UP --- .../SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs | 3 ++- .../SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs | 3 ++- .../SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs index a4119285..ef620e83 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; using EFCore.BulkExtensions; using Microsoft.AspNetCore.Authorization; @@ -332,7 +333,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase var luAssemble = lus.Select(t => t.Replace(" ", "")); bbacSaDetail.LU += luAssemble.Aggregate(new string(' ', 6), (current, index) => current + index); } - bbacSaDetail.PN = bbacSaDetail.PN.Replace("'", "").Replace("’", "").Replace("‘", ""); + bbacSaDetail.PN = Regex.Replace(bbacSaDetail.PN, "['‘’]", ""); }); return GroupPnLu(bbacSaDetails); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs index 7f78e3f8..01fceaad 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; using EFCore.BulkExtensions; using Microsoft.AspNetCore.Authorization; @@ -292,7 +293,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase var luAssemble = lus.Select(t => t.Replace(" ", "")); hbpoSaDetail.LU += luAssemble.Aggregate(new string(' ', 6), (current, index) => current + index); } - hbpoSaDetail.PN = hbpoSaDetail.PN.Replace("'", "").Replace("’", "").Replace("‘", ""); + hbpoSaDetail.PN = Regex.Replace(hbpoSaDetail.PN, "['‘’]", ""); hbpoSaDetail.CustomerPartCodeNoSpace = hbpoSaDetail.LU.Replace(" ", ""); hbpoSaDetail.Version = Version; }); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs index a8356037..43a8b815 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Linq.Dynamic.Core; +using System.Text.RegularExpressions; using System.Threading.Tasks; using EFCore.BulkExtensions; using Microsoft.AspNetCore.Authorization; @@ -403,7 +404,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase var luAssemble = lus.Select(t => t.Replace(" ", "")); pubSaDetail.LU += luAssemble.Aggregate(new string(' ', 6), (current, index) => current + index); } - pubSaDetail.PN = pubSaDetail.PN.Replace("'", "").Replace("’", "").Replace("‘", ""); + pubSaDetail.PN = Regex.Replace(pubSaDetail.PN, "['‘’]", ""); }); return GroupPnLu(pubSaDetails);