diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
index a32b48fa..877eccff 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
@@ -53,6 +53,18 @@ namespace Win.Sfs.SettleAccount.Reports
[ExporterHeader(DisplayName = "物料描述")]
public string MaterialDes { get; set; }
///
+ /// 虚拟总成号
+ ///
+ [Display(Name = "虚拟总成号")]
+ [ExporterHeader(DisplayName = "虚拟总成号")]
+ public string MatchNumber { get; set; }
+ ///
+ /// 生产码类型
+ ///
+ [Display(Name = "生产码类型")]
+ [ExporterHeader(DisplayName = "生产码类型")]
+ public string CodeType { get; set; }
+ ///
/// WMS发货数量
///
[Display(Name = "WMS发货数量")]
@@ -129,13 +141,7 @@ namespace Win.Sfs.SettleAccount.Reports
///
[Display(Name = "客户下线时间")]
[ExporterHeader(DisplayName = "客户下线时间", Format = "yyyy-MM-dd")]
- public DateTime? AssemblyDate { get; set; }
- ///
- /// 小总成号
- ///
- [Display(Name = "小总成号")]
- [ExporterHeader(DisplayName = "小总成号")]
- public string MatchNumber { get; set; }
+ public DateTime? AssemblyDate { get; set; }
///
/// 注塑码
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs
index 56536446..f8bab835 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs
@@ -119,6 +119,8 @@ namespace SettleAccount.Job.Services.Report
MaterialDes = t.Max(t => t.PartDesc),
SEQty = t.Sum(t => t.Qty),
InjectionCode = t.Max(t => t.InjectionCode),
+ MatchNumber = t.Max(t => t.MatchNumber),
+ CodeType= t.Max(t => t.CodeType),
DiffDesc = "WMS有发货EDI无订单"
}).ToList();
//有EDI有发运
@@ -154,7 +156,9 @@ namespace SettleAccount.Job.Services.Report
ErpToLoc = groupItem.Max(t => t.ErpToLoc),
CustPartCode = groupItem.Max(t => t.CustPartCode),
PartDesc = groupItem.Max(t => t.PartDesc),
- InjectionCode = groupItem.Max(t => t.InjectionCode)
+ InjectionCode = groupItem.Max(t => t.InjectionCode),
+ MatchNumber = groupItem.Max(t => t.MatchNumber),
+ CodeType = groupItem.Max(t => t.CodeType)
};
var haveEdiHaveSeList = (from edi in ediGroup
join se in seGroup
@@ -179,9 +183,10 @@ namespace SettleAccount.Job.Services.Report
MaterialDes = se.PartDesc,
SEQty = se.Qty,
EdiQty = edi.Qty,
- AssemblyDate = default,
- MatchNumber = default,
+ AssemblyDate = default,
InjectionCode = se.InjectionCode,
+ MatchNumber =se.MatchNumber,
+ CodeType =se.CodeType,
DiffDesc = "WMS有发货EDI有订单"
}).ToList();
haveEdiHaveSeList.ForEach(t => t.SequenceNumber = GetSequenceNumberDate(t.SequenceNumber));