From 501e7f94ac14b39a022f01b0f7123f8269b57268 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Fri, 26 Apr 2024 11:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=AF=94=E5=AF=B9=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=99=9A=E6=8B=9F=E6=80=BB=E6=88=90?=
=?UTF-8?q?=E5=92=8C=E7=94=9F=E4=BA=A7=E7=A0=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Reports/SaSeEdiCompareDetailReport.cs | 15 +++++++++++++++
.../Reports/SaSeEdiCompareDiff.cs | 10 ++++++++++
.../JisBBACSaSeEdiCompareExportService.cs | 17 +++++++++++++----
.../JisHBPOSaSeEdiCompareExportService.cs | 17 +++++++++++++----
4 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs
index ccac730d..1139d4e0 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs
@@ -82,6 +82,21 @@ namespace Win.Sfs.SettleAccount.Reports
[Display(Name = "物料描述")]
[ExporterHeader(DisplayName = "物料描述")]
public string PartCodeDesc { get; set; }
+
+ ///
+ /// 虚拟总成号
+ ///
+ [Display(Name = "虚拟总成号")]
+ [ExporterHeader(DisplayName = "虚拟总成号")]
+ public string MatchNumber { get; set; }
+
+ ///
+ /// 生产码类型
+ ///
+ [Display(Name = "生产码类型")]
+ [ExporterHeader(DisplayName = "生产码类型")]
+ public string CodeType { get; set; }
+
///
/// 厂内物料号
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs
index f9b87d29..d11516fe 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs
@@ -115,6 +115,16 @@ namespace Win.Sfs.SettleAccount.Reports
[Display(Name = "物料描述")]
public string PartCodeDesc { get; set; }
///
+ /// 虚拟总成号
+ ///
+ [Display(Name = "虚拟总成号")]
+ public string MatchNumber { get; set; }
+ ///
+ /// 生产码类型
+ ///
+ [Display(Name = "生产码类型")]
+ public string CodeType { get; set; }
+ ///
/// 厂内物料号
///
[Display(Name = "厂内物料号")]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
index bda08fa0..9773c3b7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
@@ -205,7 +205,9 @@ namespace SettleAccount.Job.Services.Report
ShippingDate = groupItem.Max(t => t.ShippingDate),
FactoryPartCode = groupItem.Max(t => t.FactoryPartCode),
ToLoc = groupItem.Max(t => t.ToLoc),
- ErpToLoc = groupItem.Max(t => t.ErpToLoc)
+ ErpToLoc = groupItem.Max(t => t.ErpToLoc),
+ MatchNumber = groupItem.Max(t => t.MatchNumber),
+ CodeType = groupItem.Max(t => t.CodeType)
}).Where(t => t.Qty > 0M);
//Edi
//var ediGroup = from edi in _settleAccountDbContext.Set()
@@ -245,7 +247,9 @@ namespace SettleAccount.Job.Services.Report
se.ToLoc,
se.ErpToLoc,
EdiQty = edi.Qty,
- EdiCustomerPartCode = edi.LU
+ EdiCustomerPartCode = edi.LU,
+ se.MatchNumber,
+ se.CodeType
};
var saSeCompareLeft = from sa in saGroup
join seEdi in seEdiGroup
@@ -271,7 +275,10 @@ namespace SettleAccount.Job.Services.Report
EdiCustomerPartCode = seEdi.EdiCustomerPartCode,
CustomerPartCode = sa.LU,
Site = sa.Site,
- Price = sa.Price
+ Price = sa.Price,
+ MatchNumber= seEdi.MatchNumber,
+ CodeType = seEdi.CodeType
+
};
var saSeCompareRight = from seEdi in seEdiGroup
join sa in saGroup
@@ -297,7 +304,9 @@ namespace SettleAccount.Job.Services.Report
EdiCustomerPartCode = seEdi.EdiCustomerPartCode,
CustomerPartCode = sa.LU ?? seEdi.LU,
Site = sa.Site,
- Price = sa.Price
+ Price = sa.Price,
+ MatchNumber = seEdi.MatchNumber,
+ CodeType = seEdi.CodeType
};
var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
index 8e1e821a..8b73cd09 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
@@ -197,7 +197,9 @@ namespace SettleAccount.Job.Services.Report
ShippingDate = groupItem.Max(t => t.ShippingDate),
FactoryPartCode = groupItem.Max(t => t.FactoryPartCode),
ToLoc = groupItem.Max(t => t.ToLoc),
- ErpToLoc = groupItem.Max(t => t.ErpToLoc)
+ ErpToLoc = groupItem.Max(t => t.ErpToLoc),
+ MatchNumber = groupItem.Max(t => t.MatchNumber),
+ CodeType = groupItem.Max(t => t.CodeType)
}).Where(t => t.Qty > 0M);
//Edi
@@ -259,7 +261,9 @@ namespace SettleAccount.Job.Services.Report
se.ToLoc,
se.ErpToLoc,
EdiQty = edi.Qty,
- EdiCustomerPartCode = edi.LU
+ EdiCustomerPartCode = edi.LU,
+ se.MatchNumber,
+ se.CodeType
};
//var ediSeGroup = from edi in ediGroup
@@ -309,7 +313,9 @@ namespace SettleAccount.Job.Services.Report
EdiCustomerPartCode = seEdi.EdiCustomerPartCode,
CustomerPartCode = sa.LU,
Site = sa.Site,
- Price = sa.Price
+ Price = sa.Price,
+ MatchNumber = seEdi.MatchNumber,
+ CodeType = seEdi.CodeType
};
var saSeCompareRight = from seEdi in seEdiGroup
join sa in saGroup
@@ -335,7 +341,10 @@ namespace SettleAccount.Job.Services.Report
EdiCustomerPartCode = seEdi.EdiCustomerPartCode,
CustomerPartCode = sa.LU ?? seEdi.LU,
Site = sa.Site,
- Price = sa.Price
+ Price = sa.Price,
+ MatchNumber = seEdi.MatchNumber,
+ CodeType = seEdi.CodeType
+
};
var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
var ediCheck= ediGroup.ToList();