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
///
[Display(Name = "未定义")]
None = 0,
-
///
/// JisBBAC
///
[Display(Name = "JisBBAC")]
JisBBAC = 1,
-
///
/// JisHBPO
///
[Display(Name = "JisHBPO")]
JisHBPO = 2,
-
///
/// 直供件BBAC
///
[Display(Name = "直供件BBAC")]
ZhiGongJianBBAC = 3,
-
///
/// 直供件HBPO
///
[Display(Name = "直供件HBPO")]
ZhiGongJianHBPO = 4,
-
///
/// 买单件BBAC
///
[Display(Name = "买单件BBAC")]
MaiDanJianBBAC = 5,
-
///
/// 买单件HBPO
///
[Display(Name = "买单件HBPO")]
MaiDanJianHBPO = 6,
-
///
/// 备件
///
[Display(Name = "备件")]
BeiJian = 7,
-
///
/// 印度件
///
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; }
///
- /// 是否完全匹配
+ /// 匹配类型
///
- [Display(Name = "是否完全匹配")]
+ [Display(Name = "匹配类型")]
[ExporterHeader(DisplayName = "是否完全匹配")]
- public string MateType { get; set; }
+ [ValueMapping("是", true)]
+ [ValueMapping("否", false)]
+ public bool MateType => DiffQty == 0m;
///
/// 差异说明
///
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));