更新版本

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs

@@ -31,7 +31,7 @@ namespace Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs
        [ExporterHeader(DisplayName = "组成组零件")]
         public string   ErpMaterialCode      {set;get;}
         [ExporterHeader(DisplayName = "Sap零件号")]
-        public string   SettleMaterialCode   {set;get;}
+        public string   MaterialCode   {set;get;}
         [ExporterHeader(DisplayName = "客户零件号")]
         public string   ShipMaterailCode     {set;get;}
         [ExporterHeader(DisplayName = "物料描述")]

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs

@@ -60,7 +60,7 @@ namespace Win.Sfs.SettleAccount.Repository.Report
 
         public virtual List<PartCodeDiff> GetDiffDetailReport(string year, string customcode, string version)
         {
-            string sqlString = "select a.ErpMaterialCode,SettleMaterialCode,a.ShipMaterailCode,d.MaterialDesc,d.EstimateTypeDesc from\n" +
+            string sqlString = "select a.ErpMaterialCode,isnull(d.materialCode,SettleMaterialCode) MaterialCode,a.ShipMaterailCode,d.MaterialDesc,d.EstimateTypeDesc from\n" +
 "			Set_MaterialRelationshipDetail_pg a left join\n" +
 "				(\n" +
 "			SELECT\n" +