From e3445d0cc8cbe1593dd5d3bc21b68b9903d3797b Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Fri, 26 Apr 2024 08:43:00 +0800
Subject: [PATCH] =?UTF-8?q?EDI=E5=92=8C=E5=8F=91=E8=BF=90=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E6=80=BB=E6=88=90=E5=8F=B7=E5=92=8C=E7=94=9F=E4=BA=A7=E7=A0=81?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/SeEidCompareReport.cs             | 20 ++++++++++++-------
 .../Report/SeEdiCompareExportBaseService.cs   | 11 +++++++---
 2 files changed, 21 insertions(+), 10 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 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; }
         /// <summary>
+        /// 虚拟总成号
+        /// </summary>
+        [Display(Name = "虚拟总成号")]
+        [ExporterHeader(DisplayName = "虚拟总成号")]
+        public string MatchNumber { get; set; }
+        /// <summary>
+        /// 生产码类型
+        /// </summary>
+        [Display(Name = "生产码类型")]
+        [ExporterHeader(DisplayName = "生产码类型")]
+        public string CodeType { get; set; }
+        /// <summary>
         /// WMS发货数量
         /// </summary>
         [Display(Name = "WMS发货数量")]
@@ -129,13 +141,7 @@ namespace Win.Sfs.SettleAccount.Reports
         /// </summary>
         [Display(Name = "客户下线时间")]
         [ExporterHeader(DisplayName = "客户下线时间", Format = "yyyy-MM-dd")]
-        public DateTime? AssemblyDate { get; set; }       
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        [ExporterHeader(DisplayName = "小总成号")]
-        public string MatchNumber { get; set; }
+        public DateTime? AssemblyDate { 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 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));