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;
+ }
}
}