diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs
new file mode 100644
index 00000000..a903c64d
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs
@@ -0,0 +1,176 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
+using Win.Sfs.SettleAccount.Enums;
+
+namespace Win.Sfs.SettleAccount.Reports;
+
+///
+/// 结算、发运、Eid对比明细报告
+///
+[ExcelExporter(MaxRowNumberOnASheet = 500_000)]
+public class SaSeEdiCompareDetailReport
+{
+ ///
+ /// 类别
+ ///
+ [Display(Name = "类别")]
+ [ExporterHeader(DisplayName = "类别")]
+ [ValueMapping("有结算有发运(有EDI数据)", 1)]
+ [ValueMapping("有结算有发运(无EDI数据)", 2)]
+ [ValueMapping("有结算无发运(有EDI数据)", 3)]
+ [ValueMapping("有结算无发运(无EDI数据)", 4)]
+ [ValueMapping("无结算有发运(有EDI数据)", 5)]
+ [ValueMapping("无结算有发运(无EDI数据)", 6)]
+ public EnumSaSeEdiCompareCategory Category { get; set; }
+ [Display(Name = "WMS多发")]
+ [ExporterHeader(DisplayName = "WMS多发")]
+ [ValueMapping("", 0)]
+ [ValueMapping("WMS多发", 1)]
+ public EnumWMSSend WMSSend
+ {
+ get
+ {
+ return (Category, SaSeQty < 0) switch
+ {
+ (EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi, true) => EnumWMSSend.WMSRepeat,
+ (EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi, true) => EnumWMSSend.WMSRepeat,
+ _ => EnumWMSSend.None
+ };
+ }
+ }
+ [Display(Name = "价格信息")]
+ [ExporterHeader(DisplayName = "价格信息", IsIgnore = true)]
+ [ValueMapping("有价格信息", true)]
+ [ValueMapping("无价格信息", false)]
+ public bool IsHavePrice => FixPrice != null && FixPrice != 0;
+ ///
+ /// 交货单号
+ ///
+ [Display(Name = "交货单号")]
+ [ExporterHeader(DisplayName = "交货单号")]
+ public string WmsBillNum { get; set; }
+ ///
+ /// 发货日期
+ ///
+ [Display(Name = "发货日期")]
+ [ExporterHeader(DisplayName = "发货日期")]
+ public DateTime? ShippingDate { get; set; }
+ ///
+ /// 生产码
+ ///
+ [Display(Name = "生产码")]
+ [ExporterHeader(DisplayName = "订单生产码")]
+ public string PN { get; set; }
+ ///
+ /// 日顺序号
+ ///
+ [Display(Name = "日顺序号")]
+ [ExporterHeader(DisplayName = "日顺序号")]
+ public string SeqNumber { get; set; }
+ ///
+ /// PJIS日顺序号
+ ///
+ [Display(Name = "PJIS日顺序号")]
+ [ExporterHeader(DisplayName = "PJIS日顺序号")]
+ public string PJISSeqNumber { get; set; }
+ ///
+ /// 客户物料号
+ ///
+ [Display(Name = "客户物料号")]
+ [ExporterHeader(DisplayName = "客户物料号")]
+ public string CustomerPartCode { get; set; }
+ ///
+ /// 物料描述
+ ///
+ [Display(Name = "物料描述")]
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string PartCodeDesc { get; set; }
+ ///
+ /// 厂内物料号
+ ///
+ [Display(Name = "厂内物料号")]
+ [ExporterHeader(DisplayName = "厂内物料号")]
+ public string FactoryPartCode { get; set; }
+ ///
+ /// 替换厂内物料号
+ ///
+ [Display(Name = "替换厂内物料号")]
+ [ExporterHeader(DisplayName = "替换厂内物料号")]
+ public string ReplaceFactoryPartCode { get; set; }
+ ///
+ /// 客户下线时间
+ ///
+ [Display(Name = "客户下线时间")]
+ [ExporterHeader(DisplayName = "客户下线时间")]
+ public DateTime? CustomerOfflineTime { get; set; }
+ ///
+ /// 小总成号
+ ///
+ [Display(Name = "小总成号")]
+ [ExporterHeader(DisplayName = "小总成号")]
+ public string AssemblyCode { get; set; }
+ ///
+ /// 注塑码
+ ///
+ [Display(Name = "注塑码")]
+ [ExporterHeader(DisplayName = "注塑码")]
+ public string InjectionCode { get; set; }
+ ///
+ /// 结算数量
+ ///
+ [Display(Name = "结算数量")]
+ [ExporterHeader(DisplayName = "结算数量")]
+ public decimal SAQty { get; set; }
+ ///
+ /// 发货数量
+ ///
+ [Display(Name = "发货数量")]
+ [ExporterHeader(DisplayName = "WMS发货数量")]
+ public decimal SEQty { get; set; }
+ ///
+ /// Edi数量
+ ///
+ [Display(Name = "Edi数量")]
+ [ExporterHeader(DisplayName = "Edi数量")]
+ public decimal EdiQty { get; set; }
+ ///
+ /// 结算与WMS发货量差
+ ///
+ [ExporterHeader(DisplayName = "结算与WMS发货量差")]
+ public decimal SaSeQty => SAQty - SEQty;
+ ///
+ /// 结算与EDI量差
+ ///
+ [ExporterHeader(DisplayName = "结算与EDI量差")]
+ public decimal SaEdiQty => SAQty - EdiQty;
+ ///
+ /// WMS发货与EDI数量差
+ ///
+ [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
+ public decimal SeEdiQty => SEQty - EdiQty;
+ [Display(Name = "是否完全匹配")]
+ [ExporterHeader(DisplayName = "是否完全匹配")]
+ [ValueMapping("是", true)]
+ [ValueMapping("否", false)]
+ public bool MateType => SaSeQty == 0 && SaEdiQty == 0 && SeEdiQty == 0;
+ ///
+ /// 定价
+ ///
+ [Display(Name = "定价")]
+ [ExporterHeader(DisplayName = "定价", IsIgnore = true)]
+ public decimal? FixPrice { get; set; }
+ ///
+ /// ERP销售库位
+ ///
+ [Display(Name = "ERP销售库位")]
+ [ExporterHeader(DisplayName = "ERP销售库位")]
+ public string ToErpLocCode { get; set; }
+ ///
+ /// WMS发货库位
+ ///
+ [Display(Name = "WMS发货库位")]
+ [ExporterHeader(DisplayName = "WMS发货库位")]
+ public string ToLocCode { get; set; }
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReportJisBBAC.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReportJisBBAC.cs
new file mode 100644
index 00000000..e592b95c
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReportJisBBAC.cs
@@ -0,0 +1,8 @@
+namespace Win.Sfs.SettleAccount.Reports;
+
+///
+/// JisBBAC结算、发运、Eid明细对比报告
+///
+public class SaSeEdiCompareDetailReportJisBBAC : SaSeEdiCompareDetailReport
+{
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReportJisHBPO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReportJisHBPO.cs
new file mode 100644
index 00000000..6f5e5ca4
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReportJisHBPO.cs
@@ -0,0 +1,8 @@
+namespace Win.Sfs.SettleAccount.Reports;
+
+///
+/// JisHBPO结算、发运、Eid明细对比报告
+///
+public class SaSeEdiCompareDetailReportJisHBPO : SaSeEdiCompareDetailReport
+{
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs
index 192db73e..4343ed77 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs
@@ -1,7 +1,5 @@
using System;
using System.ComponentModel.DataAnnotations;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
using Win.Sfs.SettleAccount.Enums;
namespace Win.Sfs.SettleAccount.Reports;
@@ -121,18 +119,6 @@ public class SaSeEdiCompareDiff
///
[Display(Name = "替换厂内物料号")]
public string ReplaceFactoryPartCode { get; set; }
- ///
- /// 是否替换了厂内零件号
- ///
- public bool IsReplace { get; set; }
-}
-
-///
-/// 结算、发运、Eid对比明细
-///
-[ExcelExporter(MaxRowNumberOnASheet = 500_000)]
-public class SaSeEdiCompareDetailExport
-{
}
///
@@ -144,426 +130,30 @@ public interface ISaSeEdiCompareDetailExport
/// 类别
///
[Display(Name = "类别")]
- [ExporterHeader(DisplayName = "类别")]
- [ValueMapping("有结算有发运(有EDI数据)", 1)]
- [ValueMapping("有结算有发运(无EDI数据)", 2)]
- [ValueMapping("有结算无发运(有EDI数据)", 3)]
- [ValueMapping("有结算无发运(无EDI数据)", 4)]
- [ValueMapping("无结算有发运(有EDI数据)", 5)]
- [ValueMapping("无结算有发运(无EDI数据)", 6)]
public EnumSaSeEdiCompareCategory Category { get; set; }
///
/// 零件描述
///
[Display(Name = "零件描述")]
- [ExporterHeader(DisplayName = "物料描述")]
public string PartCodeDesc { get; set; }
///
/// 替换厂内零件号
///
[Display(Name = "替换厂内零件号")]
- [ExporterHeader(DisplayName = "替换厂内零件号")]
- public string ReplaceFactoryPartCode { get; set; }
- ///
- /// 结算数量
- ///
- [Display(Name = "结算数量")]
- [ExporterHeader(DisplayName = "结算数量")]
- public decimal SAQty { get; set; }
- ///
- /// 发货数量
- ///
- [Display(Name = "发货数量")]
- [ExporterHeader(DisplayName = "WMS发货数量")]
- public decimal SEQty { get; set; }
- ///
- /// Edi数量
- ///
- [Display(Name = "Edi数量")]
- [ExporterHeader(DisplayName = "Edi数量")]
- public decimal EdiQty { get; set; }
-}
-
-///
-/// JisBBAC结算、发运、Eid对比明细
-///
-public class SaSeEdiCompareDetailExportJisBBAC : SaSeEdiCompareDetailExport, ISaSeEdiCompareDetailExport
-{
- ///
- /// 类别
- ///
- [Display(Name = "类别")]
- [ExporterHeader(DisplayName = "类别")]
- [ValueMapping("有结算有发运(有EDI数据)", 1)]
- [ValueMapping("有结算有发运(无EDI数据)", 2)]
- [ValueMapping("有结算无发运(有EDI数据)", 3)]
- [ValueMapping("有结算无发运(无EDI数据)", 4)]
- [ValueMapping("无结算有发运(有EDI数据)", 5)]
- [ValueMapping("无结算有发运(无EDI数据)", 6)]
- public EnumSaSeEdiCompareCategory Category { get; set; }
- [Display(Name = "WMS多发")]
- [ExporterHeader(DisplayName = "WMS多发")]
- [ValueMapping("", 0)]
- [ValueMapping("WMS多发", 1)]
- public EnumWMSSend WMSSend
- {
- get
- {
- return (Category, SaSeQty < 0) switch
- {
- (EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi, true) => EnumWMSSend.WMSRepeat,
- (EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi, true) => EnumWMSSend.WMSRepeat,
- _ => EnumWMSSend.None
- };
- }
- }
- [Display(Name = "价格信息")]
- [ExporterHeader(DisplayName = "价格信息")]
- [ValueMapping("有价格信息", true)]
- [ValueMapping("无价格信息", false)]
- public bool IsHavePrice => FixPrice != null && FixPrice != 0;
- ///
- /// 交货单号
- ///
- [Display(Name = "交货单号")]
- [ExporterHeader(DisplayName = "交货单号")]
- public string WmsBillNum { get; set; }
- ///
- /// 发货日期
- ///
- [Display(Name = "发货日期")]
- [ExporterHeader(DisplayName = "发货日期")]
- public DateTime? ShippingDate { get; set; }
- ///
- /// 生产码
- ///
- [Display(Name = "生产码")]
- [ExporterHeader(DisplayName = "订单生产码")]
- public string PN { get; set; }
- ///
- /// 日顺序号
- ///
- [Display(Name = "日顺序号")]
- [ExporterHeader(DisplayName = "日顺序号")]
- public string SeqNumber { get; set; }
- ///
- /// PJIS日顺序号
- ///
- [Display(Name = "PJIS日顺序号")]
- [ExporterHeader(DisplayName = "PJIS日顺序号")]
- public string PJISSeqNumber { get; set; }
- ///
- /// 客户物料号
- ///
- [Display(Name = "客户物料号")]
- [ExporterHeader(DisplayName = "客户物料号")]
- public string CustomerPartCode { get; set; }
- ///
- /// 物料描述
- ///
- [Display(Name = "物料描述")]
- [ExporterHeader(DisplayName = "物料描述")]
- public string PartCodeDesc { get; set; }
- ///
- /// 厂内物料号
- ///
- [Display(Name = "厂内物料号")]
- [ExporterHeader(DisplayName = "厂内物料号")]
- public string FactoryPartCode { get; set; }
- ///
- /// 替换厂内物料号
- ///
- [Display(Name = "替换厂内物料号")]
- [ExporterHeader(DisplayName = "替换厂内物料号")]
- public string ReplaceFactoryPartCode { get; set; }
- ///
- /// 客户下线时间
- ///
- [Display(Name = "客户下线时间")]
- [ExporterHeader(DisplayName = "客户下线时间")]
- public DateTime? CustomerOfflineTime { get; set; }
- ///
- /// 小总成号
- ///
- [Display(Name = "小总成号")]
- [ExporterHeader(DisplayName = "小总成号")]
- public string AssemblyCode { get; set; }
- ///
- /// 注塑码
- ///
- [Display(Name = "注塑码")]
- [ExporterHeader(DisplayName = "注塑码")]
- public string InjectionCode { get; set; }
- ///
- /// 结算数量
- ///
- [Display(Name = "结算数量")]
- [ExporterHeader(DisplayName = "结算数量")]
- public decimal SAQty { get; set; }
- ///
- /// 发货数量
- ///
- [Display(Name = "发货数量")]
- [ExporterHeader(DisplayName = "WMS发货数量")]
- public decimal SEQty { get; set; }
- ///
- /// Edi数量
- ///
- [Display(Name = "Edi数量")]
- [ExporterHeader(DisplayName = "Edi数量")]
- public decimal EdiQty { get; set; }
- ///
- /// 结算与WMS发货量差
- ///
- [ExporterHeader(DisplayName = "结算与WMS发货量差")]
- public decimal SaSeQty => SAQty - SEQty;
- ///
- /// 结算与EDI量差
- ///
- [ExporterHeader(DisplayName = "结算与EDI量差")]
- public decimal SaEdiQty => SAQty - EdiQty;
- ///
- /// WMS发货与EDI数量差
- ///
- [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
- public decimal SeEdiQty => SEQty - EdiQty;
- [Display(Name = "是否完全匹配")]
- [ExporterHeader(DisplayName = "是否完全匹配")]
- [ValueMapping("是", true)]
- [ValueMapping("否", false)]
- public bool MateType => SaSeQty == 0 && SaEdiQty == 0 && SeEdiQty == 0;
- ///
- /// 定价
- ///
- [Display(Name = "定价")]
- [ExporterHeader(DisplayName = "定价")]
- public virtual decimal? FixPrice { get; set; }
- ///
- /// ERP销售库位
- ///
- [Display(Name = "ERP销售库位")]
- [ExporterHeader(DisplayName = "ERP销售库位")]
- public string ToErpLocCode { get; set; }
- ///
- /// WMS发货库位
- ///
- [Display(Name = "WMS发货库位")]
- [ExporterHeader(DisplayName = "WMS发货库位")]
- public string ToLocCode { get; set; }
-}
-
-///
-/// JisHBPO结算、发运、Eid对比明细
-///
-public class SaSeEdiCompareDetailExportJisHBPO : SaSeEdiCompareDetailExport, ISaSeEdiCompareDetailExport
-{
- ///
- /// 类别
- ///
- [Display(Name = "类别")]
- [ExporterHeader(DisplayName = "类别")]
- [ValueMapping("有结算有发运(有EDI数据)", 1)]
- [ValueMapping("有结算有发运(无EDI数据)", 2)]
- [ValueMapping("有结算无发运(有EDI数据)", 3)]
- [ValueMapping("有结算无发运(无EDI数据)", 4)]
- [ValueMapping("无结算有发运(有EDI数据)", 5)]
- [ValueMapping("无结算有发运(无EDI数据)", 6)]
- public EnumSaSeEdiCompareCategory Category { get; set; }
- [Display(Name = "WMS多发")]
- [ExporterHeader(DisplayName = "WMS多发")]
- [ValueMapping("", 0)]
- [ValueMapping("WMS多发", 1)]
- public EnumWMSSend WMSSend
- {
- get
- {
- return (Category, SaSeQty < 0) switch
- {
- (EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi, true) => EnumWMSSend.WMSRepeat,
- (EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi, true) => EnumWMSSend.WMSRepeat,
- _ => EnumWMSSend.None
- };
- }
- }
- [Display(Name = "价格信息")]
- [ExporterHeader(DisplayName = "价格信息")]
- [ValueMapping("有价格信息", true)]
- [ValueMapping("无价格信息", false)]
- public bool IsHavePrice => FixPrice != null && FixPrice != 0;
- ///
- /// 交货单号
- ///
- [Display(Name = "交货单号")]
- [ExporterHeader(DisplayName = "交货单号")]
- public string WmsBillNum { get; set; }
- ///
- /// 发货日期
- ///
- [Display(Name = "发货日期")]
- [ExporterHeader(DisplayName = "发货日期")]
- public DateTime? ShippingDate { get; set; }
- ///
- /// 生产码
- ///
- [Display(Name = "生产码")]
- [ExporterHeader(DisplayName = "订单生产码")]
- public string PN { get; set; }
- ///
- /// 日顺序号
- ///
- [Display(Name = "日顺序号")]
- [ExporterHeader(DisplayName = "日顺序号")]
- public string SeqNumber { get; set; }
- ///
- /// PJIS日顺序号
- ///
- [Display(Name = "PJIS日顺序号")]
- [ExporterHeader(DisplayName = "PJIS日顺序号")]
- public string PJISSeqNumber { get; set; }
- ///
- /// 客户物料号
- ///
- [Display(Name = "客户物料号")]
- [ExporterHeader(DisplayName = "客户物料号")]
- public string CustomerPartCode { get; set; }
- ///
- /// 物料描述
- ///
- [Display(Name = "物料描述")]
- [ExporterHeader(DisplayName = "物料描述")]
- public string PartCodeDesc { get; set; }
- ///
- /// 厂内物料号
- ///
- [Display(Name = "厂内物料号")]
- [ExporterHeader(DisplayName = "厂内物料号")]
- public string FactoryPartCode { get; set; }
- ///
- /// 替换厂内物料号
- ///
- [Display(Name = "替换厂内物料号")]
- [ExporterHeader(DisplayName = "替换厂内物料号")]
public string ReplaceFactoryPartCode { get; set; }
///
- /// 客户下线时间
- ///
- [Display(Name = "客户下线时间")]
- [ExporterHeader(DisplayName = "客户下线时间")]
- public DateTime? CustomerOfflineTime { get; set; }
- ///
- /// 小总成号
- ///
- [Display(Name = "小总成号")]
- [ExporterHeader(DisplayName = "小总成号")]
- public string AssemblyCode { get; set; }
- ///
- /// 注塑码
- ///
- [Display(Name = "注塑码")]
- [ExporterHeader(DisplayName = "注塑码")]
- public string InjectionCode { get; set; }
- ///
/// 结算数量
///
[Display(Name = "结算数量")]
- [ExporterHeader(DisplayName = "结算数量")]
public decimal SAQty { get; set; }
///
/// 发货数量
///
[Display(Name = "发货数量")]
- [ExporterHeader(DisplayName = "WMS发货数量")]
public decimal SEQty { get; set; }
///
/// Edi数量
///
[Display(Name = "Edi数量")]
- [ExporterHeader(DisplayName = "Edi数量")]
public decimal EdiQty { get; set; }
- ///
- /// 结算与EDI量差
- ///
- [ExporterHeader(DisplayName = "结算与WMS发货量差")]
- public decimal SaSeQty => SAQty - SEQty;
- ///
- /// 结算与EDI量差
- ///
- [ExporterHeader(DisplayName = "结算与EDI量差")]
- public decimal SaEdiQty => SAQty - EdiQty;
- ///
- /// WMS发货与EDI数量差
- ///
- [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
- public decimal SeEdiQty => SEQty - EdiQty;
- [Display(Name = "是否完全匹配")]
- [ExporterHeader(DisplayName = "是否完全匹配")]
- [ValueMapping("是", true)]
- [ValueMapping("否", false)]
- public bool MateType => SaSeQty == 0 && SaEdiQty == 0 && SeEdiQty == 0;
- ///
- /// 定价
- ///
- [Display(Name = "定价")]
- [ExporterHeader(DisplayName = "定价")]
- public virtual decimal? FixPrice { get; set; }
- ///
- /// ERP销售库位
- ///
- [Display(Name = "ERP销售库位")]
- [ExporterHeader(DisplayName = "ERP销售库位")]
- public string ToErpLocCode { get; set; }
- ///
- /// WMS发货库位
- ///
- [Display(Name = "WMS发货库位")]
- [ExporterHeader(DisplayName = "WMS发货库位")]
- public string ToLocCode { get; set; }
-}
-
-///
-/// PUB结算与发运对比汇总
-///
-[ExcelExporter(MaxRowNumberOnASheet = 500_000)]
-public class SaSeEdiCompareSumExport
-{
- ///
- /// 厂内物料号
- ///
- [Display(Name = "厂内物料号")]
- [ExporterHeader(DisplayName = "LU")]
- public string FactoryPartCode { get; set; }
- ///
- /// 物料描述
- ///
- [Display(Name = "物料描述")]
- [ExporterHeader(DisplayName = "物料描述")]
- public string PartCodeDesc { get; set; }
- ///
- /// 结算数量
- ///
- [Display(Name = "结算数量")]
- [ExporterHeader(DisplayName = "结算数量")]
- public decimal SAQty { get; set; }
- ///
- /// 发货数量
- ///
- [Display(Name = "发货数量")]
- [ExporterHeader(DisplayName = "WMS发货数量")]
- public decimal SEQty { get; set; }
- ///
- /// Edi数量
- ///
- [Display(Name = "Edi数量")]
- [ExporterHeader(DisplayName = "Edi数量")]
- public decimal EdiQty { get; set; }
- ///
- /// 结算与EDI量差
- ///
- [ExporterHeader(DisplayName = "结算与EDI量差")]
- public decimal SaEdiQty => SAQty - EdiQty;
- ///
- /// WMS发货与EDI数量差
- ///
- [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
- public decimal SeEdiQty => SEQty - EdiQty;
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs
new file mode 100644
index 00000000..93100f01
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareSumReport.cs
@@ -0,0 +1,53 @@
+using System.ComponentModel.DataAnnotations;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
+
+namespace Win.Sfs.SettleAccount.Reports;
+
+///
+/// 结算、发运、Edi汇总对比报告
+///
+[ExcelExporter(MaxRowNumberOnASheet = 500_000)]
+public class SaSeEdiCompareSumReport
+{
+ ///
+ /// 厂内物料号
+ ///
+ [Display(Name = "厂内物料号")]
+ [ExporterHeader(DisplayName = "LU")]
+ public string FactoryPartCode { get; set; }
+ ///
+ /// 物料描述
+ ///
+ [Display(Name = "物料描述")]
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string PartCodeDesc { get; set; }
+ ///
+ /// 结算数量
+ ///
+ [Display(Name = "结算数量")]
+ [ExporterHeader(DisplayName = "结算数量")]
+ public decimal SAQty { get; set; }
+ ///
+ /// 发货数量
+ ///
+ [Display(Name = "发货数量")]
+ [ExporterHeader(DisplayName = "WMS发货数量")]
+ public decimal SEQty { get; set; }
+ ///
+ /// Edi数量
+ ///
+ [Display(Name = "Edi数量")]
+ [ExporterHeader(DisplayName = "Edi数量")]
+ public decimal EdiQty { get; set; }
+ ///
+ /// 结算与EDI量差
+ ///
+ [ExporterHeader(DisplayName = "结算与EDI量差")]
+ public decimal SaEdiQty => SAQty - EdiQty;
+ ///
+ /// WMS发货与EDI数量差
+ ///
+ [ExporterHeader(DisplayName = "WMS发货与EDI数量差")]
+ public decimal SeEdiQty => SEQty - EdiQty;
+}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReportJisBBAC.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReportJisBBAC.cs
index 36a79337..03f90227 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReportJisBBAC.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReportJisBBAC.cs
@@ -3,7 +3,7 @@ using Magicodes.ExporterAndImporter.Excel;
namespace Win.Sfs.SettleAccount.Reports;
///
-/// JisBBAC 发运、Edi与对比导出
+/// JisBBAC 发运、Edi与对比报告
///
[ExcelExporter(MaxRowNumberOnASheet = 500_000)]
public class SeEidCompareReportJisBBAC : SeEidCompareReport
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
index 45b5fee1..73da9782 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
@@ -106,8 +106,8 @@ namespace SettleAccount.Job.Services.Report
saSeEdiCompareDiffs = saSeEdiCompareDiffs.OrderBy(t => t.Category).ToList();
var excelExporter = new ExcelExporter();
- var items = _objectMapper.Map, List>(saSeEdiCompareDiffs);
- excelExporter = BindExcelExporter(items, businessTypeDisplayName);
+ var items = _objectMapper.Map, List>(saSeEdiCompareDiffs);
+ excelExporter = BindExcelExporter(items, businessTypeDisplayName);
var result = excelExporter.ExportAppendDataAsByteArray();
result.ShouldNotBeNull();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
index b5dc8e4c..0869466a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
@@ -105,8 +105,8 @@ namespace SettleAccount.Job.Services.Report
saSeEdiCompareDiffs = saSeEdiCompareDiffs.OrderBy(t => t.Category).ToList();
var excelExporter = new ExcelExporter();
- var items = _objectMapper.Map, List>(saSeEdiCompareDiffs);
- excelExporter = BindExcelExporter(items, businessTypeDisplayName);
+ var items = _objectMapper.Map, List>(saSeEdiCompareDiffs);
+ excelExporter = BindExcelExporter(items, businessTypeDisplayName);
var result = excelExporter.ExportAppendDataAsByteArray();
result.ShouldNotBeNull();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs
index f3f240a6..59170860 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs
@@ -179,7 +179,7 @@ namespace SettleAccount.Job.Services.Report
///
/// 创建导出文件结构
///
- public ExcelExporter BindExcelExporter(List saSeEdiCompareDetailExports, string businessTypeDisplayName) where T : SaSeEdiCompareDetailExport, ISaSeEdiCompareDetailExport, new()
+ public ExcelExporter BindExcelExporter(List saSeEdiCompareDetailExports, string businessTypeDisplayName) where T : SaSeEdiCompareDetailReport, new()
{
//详情Sheet行数
var detailMaxRowNumberOnASheet = AppConst.DefaultRowNumberOnASheet;
@@ -191,14 +191,14 @@ namespace SettleAccount.Job.Services.Report
//汇总Sheet行数
var sumMaxRowNumberOnASheet = AppConst.DefaultRowNumberOnASheet;
- var sumExportExporterAttribute = typeof(SaSeEdiCompareSumExport).GetAttribute(inherit: true);
+ var sumExportExporterAttribute = typeof(SaSeEdiCompareSumReport).GetAttribute(inherit: true);
if (sumExportExporterAttribute != null)
{
sumMaxRowNumberOnASheet = sumExportExporterAttribute.MaxRowNumberOnASheet > 0 ? sumExportExporterAttribute.MaxRowNumberOnASheet : sumMaxRowNumberOnASheet;
}
//汇总
- var saSeEdiCompareSumExports = saSeEdiCompareDetailExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumExport()
+ var saSeEdiCompareSumExports = saSeEdiCompareDetailExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumReport()
{
FactoryPartCode = p.Key,
PartCodeDesc = p.FirstOrDefault().PartCodeDesc,
@@ -210,7 +210,7 @@ namespace SettleAccount.Job.Services.Report
//有结算有发运
var haveSaHaveSeExports = saSeEdiCompareDetailExports.FindAll(t => new EnumSaSeEdiCompareCategory[] { EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi, EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi }.Contains(t.Category));
//有结算有发运汇总
- var haveSaHaveSeSumExports = haveSaHaveSeExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumExport()
+ var haveSaHaveSeSumExports = haveSaHaveSeExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumReport()
{
FactoryPartCode = p.Key,
PartCodeDesc = p.FirstOrDefault().PartCodeDesc,
@@ -221,7 +221,7 @@ namespace SettleAccount.Job.Services.Report
//有结算无发运
var haveSaNotHaveSeExports = saSeEdiCompareDetailExports.FindAll(t => new EnumSaSeEdiCompareCategory[] { EnumSaSeEdiCompareCategory.HaveSaNotHaveSeHaveEdi, EnumSaSeEdiCompareCategory.HaveSaNotHaveSeNotHaveEdi }.Contains(t.Category));
//有结算无发运
- var haveSaNotHaveSeSumExports = haveSaNotHaveSeExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumExport()
+ var haveSaNotHaveSeSumExports = haveSaNotHaveSeExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumReport()
{
FactoryPartCode = p.Key,
PartCodeDesc = p.FirstOrDefault().PartCodeDesc,
@@ -232,7 +232,7 @@ namespace SettleAccount.Job.Services.Report
//无结算有发运
var notHaveSaHaveSeExports = saSeEdiCompareDetailExports.FindAll(t => new EnumSaSeEdiCompareCategory[] { EnumSaSeEdiCompareCategory.NotHaveSaHaveSeHaveEdi, EnumSaSeEdiCompareCategory.NotHaveSaHaveSeNotHaveEdi }.Contains(t.Category));
//无结算有发运
- var notHaveSaHaveSeSumExports = notHaveSaHaveSeExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumExport()
+ var notHaveSaHaveSeSumExports = notHaveSaHaveSeExports.GroupBy(p => p.ReplaceFactoryPartCode).Select(p => new SaSeEdiCompareSumReport()
{
FactoryPartCode = p.Key,
PartCodeDesc = p.FirstOrDefault().PartCodeDesc,
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobAutoMapperProfile.cs
index 0611695b..55dffce8 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobAutoMapperProfile.cs
@@ -28,8 +28,8 @@ namespace SettleAccount.Job
///
public void CreateMapSaSeEdiCompare()
{
- CreateMap();
- CreateMap();
+ CreateMap();
+ CreateMap();
CreateMap();
CreateMap();
}