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

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>

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,