From ad9e667d06da718634c04757ac6938bcc589436e Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Tue, 16 Jan 2024 13:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0RealPN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/BBAC_SA_SERVICE.cs            |  3 ++-
 .../Entities/BQ/HBPO_SA_SERVICE.cs            |  2 ++
 .../SettleAccount.Domain/Bases/EntityBase.cs  | 24 +++++++++----------
 3 files changed, 16 insertions(+), 13 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 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
         /// 生產號
         /// </summary>
         public virtual string PN { get; set; }
-        /// <summary>
-        /// 真实生產號
-        /// </summary>
-        public virtual string RealPN { get; set; }
+        ///// <summary>
+        ///// 真实生產號
+        ///// </summary>
+        //public virtual string RealPN { get; set; }
         /// <summary>
         /// 組合鍵值（LU+PN）
         /// </summary>
@@ -411,10 +411,10 @@ namespace SettleAccount.Bases
         /// 生產號
         /// </summary>
         public string PN { get; set; }
-        /// <summary>
-        /// 真实生產號
-        /// </summary>
-        public virtual string RealPN { get; set; }
+        ///// <summary>
+        ///// 真实生產號
+        ///// </summary>
+        //public virtual string RealPN { get; set; }
         /// <summary>
         /// 組合鍵值（LU+PN）
         /// </summary>
@@ -493,10 +493,10 @@ namespace SettleAccount.Bases
         /// 生產號
         /// </summary>
         public string PN { get; set; }
-        /// <summary>
-        /// 真实生產號
-        /// </summary>
-        public virtual string RealPN { get; set; }
+        ///// <summary>
+        ///// 真实生產號
+        ///// </summary>
+        //public virtual string RealPN { get; set; }
         /// <summary>
         /// 組合鍵值（LU+PN）
         /// </summary>