From 30ba16692827bc90f652972fb5651d179385c197 Mon Sep 17 00:00:00 2001 From: mahao Date: Thu, 19 Oct 2023 08:40:30 +0800 Subject: [PATCH] =?UTF-8?q?[179]=20JISBBAC=E4=B8=89=E6=96=B9=E6=AF=94?= =?UTF-8?q?=E5=AF=B9=E6=B1=87=E6=80=BB=E6=B7=BB=E5=8A=A0=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E4=B8=8E=E5=8F=91=E8=BF=90=E9=87=8F=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enums/EnumPubSaSeCompareCategory.cs | 3 --- .../SaSeCompareDetailReportMaiDanJianBBAC.cs | 6 +++++ .../Reports/SaSeCompareDiff.cs | 4 ++-- .../Reports/SaSeEdiCompareSumReport.cs | 4 ++-- .../MaiDanBBACSaSeCompareExportService.cs | 23 +++++++++++++++++++ 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Enums/EnumPubSaSeCompareCategory.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Enums/EnumPubSaSeCompareCategory.cs index 83a58d5b..e991d44a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Enums/EnumPubSaSeCompareCategory.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Enums/EnumPubSaSeCompareCategory.cs @@ -12,19 +12,16 @@ namespace Win.Sfs.SettleAccount.Enums /// [Display(Name = "未定义")] None = 0, - /// /// 有结算有发运 /// [Display(Name = "有结算有发运")] HaveSaHaveSe = 1, - /// /// 有结算无发运 /// [Display(Name = "有结算无发运")] HaveSaNotHaveSe = 2, - /// /// 无结算有发运 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReportMaiDanJianBBAC.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReportMaiDanJianBBAC.cs index e559a40f..5d26c77e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReportMaiDanJianBBAC.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReportMaiDanJianBBAC.cs @@ -22,5 +22,11 @@ namespace Win.Sfs.SettleAccount.Reports [Display(Name = "生产码类型")] [ExporterHeader(DisplayName = "生产码类型")] public string CodeType { get; set; } + /// + /// 备注 + /// + [Display(Name = "备注")] + [ExporterHeader(DisplayName = "备注")] + public string Remark { get; set; } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs index 49561c69..de0cd5a1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs @@ -111,9 +111,9 @@ namespace Win.Sfs.SettleAccount.Reports [Display(Name = "替换厂内物料号")] public string ReplaceFactoryPartCode { get; set; } /// - /// 是否已经移除 + /// 备注 /// - public bool IsRemove { get; set; } + public string Remark { get; set; } /// /// 是否是当期 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs index 98add815..db03c544 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs @@ -43,7 +43,7 @@ namespace Win.Sfs.SettleAccount.Reports /// /// 结算与发运数量差 /// - [ExporterHeader(DisplayName = "WMS发货与EDI数量差")] + [ExporterHeader(DisplayName = "结算与WMS发货量差")] public decimal SaSeQty => SAQty - SEQty; /// /// 结算与EDI量差 @@ -53,7 +53,7 @@ namespace Win.Sfs.SettleAccount.Reports /// /// WMS发货与EDI数量差 /// - [ExporterHeader(DisplayName = "WMS发货与EDI数量差")] + [ExporterHeader(DisplayName = "WMS发货与EDI量差")] public decimal SeEdiQty => SEQty - EdiQty; } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs index 1bf51cae..528ea414 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs @@ -101,6 +101,10 @@ namespace SettleAccount.Job.Services.Report pubSaSeCompareDiffs = ThreeCompare(pubSaSeCompareDiffs); #endregion + #region 对比Edi + pubSaSeCompareDiffs = EdiCompare(pubSaSeCompareDiffs); + #endregion + #region 结算数据处理 HandleSaDetails(pubSaSeCompareDiffs, businessType, version); HandleSaDetailsMain(pubSaSeCompareDiffs, businessType, version); @@ -353,5 +357,24 @@ namespace SettleAccount.Job.Services.Report return saSeCompareDiffs; } + + /// + /// 对比Edi + /// + /// + /// *有结算无发运数据对比Edi + /// + public List EdiCompare(List saSeCompareDiffs) + { + //有结算无发运 + var haveSaNotHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe); + var keyCodes = haveSaNotHaveSes.Select(t => t.PN + t.CustomerPartCode).ToList(); + var edis = _settleAccountDbContext.Set().Where(t => keyCodes.Contains(t.KeyCode)); + saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe).ForEach(saSeCompareDiff => + { + saSeCompareDiff.Remark = "有Edi"; + }); + return null; + } } }