From e17b47ec0b10ff449219eba95ac84cee92ed59a2 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Tue, 26 Dec 2023 17:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0EDI=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/SeEidCompareReport.cs                   |  9 ++++++++-
 .../Report/SeEdiCompareExportBaseService.cs         | 13 ++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

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 456fcef1..a32b48fa 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
@@ -33,6 +33,7 @@ namespace Win.Sfs.SettleAccount.Reports
         [Display(Name = "生产码序列号日期")]
         [ExporterHeader(DisplayName = "生产码序列号日期")]
         public string SequenceNumber { get; set; }
+       
         /// <summary>
         /// 生产码
         /// </summary>
@@ -92,7 +93,13 @@ namespace Win.Sfs.SettleAccount.Reports
         /// </summary>
         [Display(Name = "发货日期")]
         [ExporterHeader(DisplayName = "发货日期", Format = "yyyy-MM-dd")]
-        public DateTime? ShippingDate { get; set; }        
+        public DateTime? ShippingDate { get; set; }
+        /// <summary>
+        /// EDI日期
+        /// </summary>
+        [Display(Name = "EDI日期")]
+        [ExporterHeader(DisplayName = "EDI日期", Format = "yyyy-MM-dd")]
+        public DateTime? AssembleData { get; set; }
         /// <summary>
         /// 序列号
         /// </summary>
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 2cac1829..c728ad17 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
@@ -67,7 +67,7 @@ namespace SettleAccount.Job.Services.Report
                     Category = "JIS",
                     CarModeCode = t.Max(t => t.Extend4),
                     LineStationcode = t.Max(t => t.LineStationCode),
-                    SequenceNumber = t.Max(t => t.Extend3),
+                    SequenceNumber = t.Max(t => t.Extend3),                   
                     ParType = t.Max(t => t.Extend2),
                     PN = t.Key.PN,
                     MaterialNumber = t.Max(t => t.LU),
@@ -107,7 +107,8 @@ namespace SettleAccount.Job.Services.Report
                     Category = "JIS",
                     WmsBillNum = t.Max(t => t.BillNum),
                     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),
                     Seq = t.Max(t => t.Seq),
                     PjsNum = t.Max(t => t.PjsNum),
@@ -130,7 +131,7 @@ namespace SettleAccount.Job.Services.Report
                                Qty = groupItem.Sum(t => t.Qty),
                                Extend2 = groupItem.Max(t => t.Extend2),
                                Extend3 = groupItem.Max(t => t.Extend3),
-                               Extend4 = groupItem.Max(t => t.Extend4),
+                               Extend4 = groupItem.Max(t => t.Extend4),                               
                                LineStationCode = groupItem.Max(t => t.LineStationCode)
                            };
             var seGroup = from se in _settleAccountDbContext.Set<TSe>()
@@ -144,7 +145,8 @@ namespace SettleAccount.Job.Services.Report
                               LU = groupItem.Max(t => t.LU),
                               BillNum = groupItem.Max(t => t.BillNum),
                               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),
                               PjsNum = groupItem.Max(t => t.PjsNum),
                               ToLoc = groupItem.Max(t => t.ToLoc),
@@ -165,7 +167,8 @@ namespace SettleAccount.Job.Services.Report
                                          SequenceNumber = edi.Extend3,
                                          ParType = edi.Extend2,
                                          MESConfigCode = se.MESConfigCode,
-                                         ShippingDate = se.BillTime,                                         
+                                         ShippingDate = se.BillTime,
+                                         AssembleData=se.AssembleData,
                                          PN = se.PN,
                                          Seq = se.Seq,
                                          PjsNum = se.PjsNum,