From 1dbdb734c4db05df04e2a729fb65a82c705930c8 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Tue, 12 Sep 2023 13:24:44 +0800
Subject: [PATCH] up

---
 .../Entities/BQ/PUB_SE_DETAIL_SERVICE.cs                  | 1 -
 .../src/SettleAccount.Domain/EnumBusinessType.cs          | 8 --------
 .../SettleAccount.Domain/Reports/SeEidCompareReport.cs    | 8 +++++---
 .../Services/Report/SeEdiCompareExportBaseService.cs      | 3 ---
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs
index da8c89b1..752f6c6d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs
@@ -114,7 +114,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     AssemblyDate = DateTime.Now,
                     MatchNumber = i.ToString(),
                     InjectionCode = i.ToString(),
-                    MateType = "是",
                     DiffDesc = "WMS有发货EDI有订单"
                 });
             }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs
index 229d2368..c22b0088 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs
@@ -12,49 +12,41 @@ public enum EnumBusinessType
     /// </summary>
     [Display(Name = "未定义")]
     None = 0,
-
     /// <summary>
     /// JisBBAC
     /// </summary>
     [Display(Name = "JisBBAC")]
     JisBBAC = 1,
-
     /// <summary>
     /// JisHBPO
     /// </summary>
     [Display(Name = "JisHBPO")]
     JisHBPO = 2,
-
     /// <summary>
     /// 直供件BBAC
     /// </summary>
     [Display(Name = "直供件BBAC")]
     ZhiGongJianBBAC = 3,
-
     /// <summary>
     /// 直供件HBPO
     /// </summary>
     [Display(Name = "直供件HBPO")]
     ZhiGongJianHBPO = 4,
-
     /// <summary>
     /// 买单件BBAC
     /// </summary>
     [Display(Name = "买单件BBAC")]
     MaiDanJianBBAC = 5,
-
     /// <summary>
     /// 买单件HBPO
     /// </summary>
     [Display(Name = "买单件HBPO")]
     MaiDanJianHBPO = 6,
-
     /// <summary>
     /// 备件
     /// </summary>
     [Display(Name = "备件")]
     BeiJian = 7,
-
     /// <summary>
     /// 印度件
     /// </summary>
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 c1cac5c7..ca8bf756 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SeEidCompareReport.cs
@@ -136,11 +136,13 @@ public class SeEidCompareReport
     [ExporterHeader(DisplayName = "注塑码")]
     public string InjectionCode { get; set; }
     /// <summary>
-    /// 是否完全匹配
+    /// 匹配类型
     /// </summary>
-    [Display(Name = "是否完全匹配")]
+    [Display(Name = "匹配类型")]
     [ExporterHeader(DisplayName = "是否完全匹配")]
-    public string MateType { get; set; }
+    [ValueMapping("是", true)]
+    [ValueMapping("否", false)]
+    public bool MateType => DiffQty == 0m;
     /// <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 47bc6d7c..f7c32932 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
@@ -66,7 +66,6 @@ namespace SettleAccount.Job.Services.Report
                     EdiQty = t.Sum(t => t.Qty),
                     AssemblyDate = default,
                     MatchNumber = default,
-                    MateType = "否",
                     DiffDesc = "WMS漏发货EDI有订单"
                 }).ToList();
             haveEdiNotHaveSeList.ForEach(t =>
@@ -94,7 +93,6 @@ namespace SettleAccount.Job.Services.Report
                     MaterialDes = t.Max(t => t.PartDesc),
                     SEQty = t.Sum(t => t.Qty),
                     InjectionCode = t.Max(t => t.InjectionCode),
-                    MateType = "否",
                     DiffDesc = "WMS有发货EDI无订单"
                 }).ToList();
             //有EDI有发运
@@ -156,7 +154,6 @@ namespace SettleAccount.Job.Services.Report
                                          AssemblyDate = default,
                                          MatchNumber = default,
                                          InjectionCode = se.InjectionCode,
-                                         MateType = se.Qty == edi.Qty ? "是" : "否",
                                          DiffDesc = "WMS有发货EDI有订单"
                                      }).ToList();
             haveEdiHaveSeList.ForEach(t => t.SequenceNumber = GetSequenceNumberDate(t.SequenceNumber));