Browse Source

增加RealPN

master
zhouhongjun 8 months ago
parent
commit
ad9e667d06
  1. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
  3. 24
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

3
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.Version = Version;
importBBACSaDetail.Site = Site; importBBACSaDetail.Site = Site;
importBBACSaDetail.BusinessType = importBBACSaDetail.PN.Contains("R0") ? EnumBusinessType.MaiDanJianBBAC : EnumBusinessType.JisBBAC; 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); var jisSaDetails = importBBACSaDetails.FindAll(t => t.BusinessType == EnumBusinessType.JisBBAC);

2
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(" ", "")); var luAssemble = lus.Select(t => t.Replace(" ", ""));
hbpoSaDetail.LU += luAssemble.Aggregate(new string(' ', 6), (current, index) => current + index); hbpoSaDetail.LU += luAssemble.Aggregate(new string(' ', 6), (current, index) => current + index);
} }
hbpoSaDetail.PN = Regex.Replace(hbpoSaDetail.PN, "['‘’]", ""); hbpoSaDetail.PN = Regex.Replace(hbpoSaDetail.PN, "['‘’]", "");
hbpoSaDetail.CustomerPartCodeNoSpace = hbpoSaDetail.LU.Replace(" ", ""); hbpoSaDetail.CustomerPartCodeNoSpace = hbpoSaDetail.LU.Replace(" ", "");
hbpoSaDetail.Version = Version; hbpoSaDetail.Version = Version;
hbpoSaDetail.ExtraProperties.TryAdd("RealPN", hbpoSaDetail.PN);
}); });
return hbpoSaDetails; return hbpoSaDetails;
} }

24
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@ -341,10 +341,10 @@ namespace SettleAccount.Bases
/// 生產號 /// 生產號
/// </summary> /// </summary>
public virtual string PN { get; set; } public virtual string PN { get; set; }
/// <summary> ///// <summary>
/// 真实生產號 ///// 真实生產號
/// </summary> ///// </summary>
public virtual string RealPN { get; set; } //public virtual string RealPN { get; set; }
/// <summary> /// <summary>
/// 組合鍵值(LU+PN) /// 組合鍵值(LU+PN)
/// </summary> /// </summary>
@ -411,10 +411,10 @@ namespace SettleAccount.Bases
/// 生產號 /// 生產號
/// </summary> /// </summary>
public string PN { get; set; } public string PN { get; set; }
/// <summary> ///// <summary>
/// 真实生產號 ///// 真实生產號
/// </summary> ///// </summary>
public virtual string RealPN { get; set; } //public virtual string RealPN { get; set; }
/// <summary> /// <summary>
/// 組合鍵值(LU+PN) /// 組合鍵值(LU+PN)
/// </summary> /// </summary>
@ -493,10 +493,10 @@ namespace SettleAccount.Bases
/// 生產號 /// 生產號
/// </summary> /// </summary>
public string PN { get; set; } public string PN { get; set; }
/// <summary> ///// <summary>
/// 真实生產號 ///// 真实生產號
/// </summary> ///// </summary>
public virtual string RealPN { get; set; } //public virtual string RealPN { get; set; }
/// <summary> /// <summary>
/// 組合鍵值(LU+PN) /// 組合鍵值(LU+PN)
/// </summary> /// </summary>

Loading…
Cancel
Save