Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

master
zhaoxinyu 11 months ago
parent
commit
7035a11012
  1. 7
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
  2. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs

7
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs

@ -33,6 +33,7 @@ namespace Win.Sfs.SettleAccount.Reports
[Display(Name = "生产码序列号日期")] [Display(Name = "生产码序列号日期")]
[ExporterHeader(DisplayName = "生产码序列号日期")] [ExporterHeader(DisplayName = "生产码序列号日期")]
public string SequenceNumber { get; set; } public string SequenceNumber { get; set; }
/// <summary> /// <summary>
/// 生产码 /// 生产码
/// </summary> /// </summary>
@ -94,6 +95,12 @@ namespace Win.Sfs.SettleAccount.Reports
[ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")] [ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")]
public DateTime? ShippingDate { get; set; } public DateTime? ShippingDate { get; set; }
/// <summary> /// <summary>
/// EDI日期
/// </summary>
[Display(Name = "EDI日期")]
[ExporterHeader(DisplayName = "EDI日期", Format = "yyyy-MM-dd")]
public DateTime? AssembleData { get; set; }
/// <summary>
/// 序列号 /// 序列号
/// </summary> /// </summary>
[Display(Name = "序列号")] [Display(Name = "序列号")]

3
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs

@ -108,6 +108,7 @@ namespace SettleAccount.Job.Services.Report
WmsBillNum = t.Max(t => t.BillNum), WmsBillNum = t.Max(t => t.BillNum),
MESConfigCode = t.Max(t => t.MESConfigCode), MESConfigCode = t.Max(t => t.MESConfigCode),
ShippingDate = t.Max(t => t.BillTime), ShippingDate = t.Max(t => t.BillTime),
AssembleData = t.Max(t => t.AssembleData),
PN = t.Max(t => t.PN), PN = t.Max(t => t.PN),
Seq = t.Max(t => t.Seq), Seq = t.Max(t => t.Seq),
PjsNum = t.Max(t => t.PjsNum), PjsNum = t.Max(t => t.PjsNum),
@ -145,6 +146,7 @@ namespace SettleAccount.Job.Services.Report
BillNum = groupItem.Max(t => t.BillNum), BillNum = groupItem.Max(t => t.BillNum),
MESConfigCode = groupItem.Max(t => t.MESConfigCode), MESConfigCode = groupItem.Max(t => t.MESConfigCode),
BillTime = groupItem.Max(t => t.BillTime), BillTime = groupItem.Max(t => t.BillTime),
AssembleData = groupItem.Max(t => t.AssembleData),
Seq = groupItem.Max(t => t.Seq), Seq = groupItem.Max(t => t.Seq),
PjsNum = groupItem.Max(t => t.PjsNum), PjsNum = groupItem.Max(t => t.PjsNum),
ToLoc = groupItem.Max(t => t.ToLoc), ToLoc = groupItem.Max(t => t.ToLoc),
@ -166,6 +168,7 @@ namespace SettleAccount.Job.Services.Report
ParType = edi.Extend2, ParType = edi.Extend2,
MESConfigCode = se.MESConfigCode, MESConfigCode = se.MESConfigCode,
ShippingDate = se.BillTime, ShippingDate = se.BillTime,
AssembleData=se.AssembleData,
PN = se.PN, PN = se.PN,
Seq = se.Seq, Seq = se.Seq,
PjsNum = se.PjsNum, PjsNum = se.PjsNum,

Loading…
Cancel
Save