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 40885a68..78003e65 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 @@ -160,7 +160,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ importBBACSaDetail.Version = Version; importBBACSaDetail.Site = Site; importBBACSaDetail.BusinessType = importBBACSaDetail.PN.Contains("R0") ? EnumBusinessType.MaiDanJianBBAC : EnumBusinessType.JisBBAC; - importBBACSaDetail.RealPN = importBBACSaDetail.PN; + //importBBACSaDetail.RealPN = importBBACSaDetail.PN; + importBBACSaDetail.ExtraProperties.TryAdd("RealPN", importBBACSaDetail.PN); }); var jisSaDetails = importBBACSaDetails.FindAll(t => t.BusinessType == EnumBusinessType.JisBBAC); 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 6b10a5f3..1def0478 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 @@ -265,9 +265,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var luAssemble = lus.Select(t => t.Replace(" ", "")); hbpoSaDetail.LU += luAssemble.Aggregate(new string(' ', 6), (current, index) => current + index); } + hbpoSaDetail.PN = Regex.Replace(hbpoSaDetail.PN, "['‘’]", ""); hbpoSaDetail.CustomerPartCodeNoSpace = hbpoSaDetail.LU.Replace(" ", ""); hbpoSaDetail.Version = Version; + hbpoSaDetail.ExtraProperties.TryAdd("RealPN", hbpoSaDetail.PN); }); return hbpoSaDetails; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs index 7ef977d0..7feca1aa 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs @@ -341,10 +341,10 @@ namespace SettleAccount.Bases /// 生產號 /// public virtual string PN { get; set; } - /// - /// 真实生產號 - /// - public virtual string RealPN { get; set; } + ///// + ///// 真实生產號 + ///// + //public virtual string RealPN { get; set; } /// /// 組合鍵值(LU+PN) /// @@ -411,10 +411,10 @@ namespace SettleAccount.Bases /// 生產號 /// public string PN { get; set; } - /// - /// 真实生產號 - /// - public virtual string RealPN { get; set; } + ///// + ///// 真实生產號 + ///// + //public virtual string RealPN { get; set; } /// /// 組合鍵值(LU+PN) /// @@ -493,10 +493,10 @@ namespace SettleAccount.Bases /// 生產號 /// public string PN { get; set; } - /// - /// 真实生產號 - /// - public virtual string RealPN { get; set; } + ///// + ///// 真实生產號 + ///// + //public virtual string RealPN { get; set; } /// /// 組合鍵值(LU+PN) ///