更新版本

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

@@ -19,9 +19,9 @@ namespace Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs
 
         [ExporterHeader(DisplayName = "ERP物料编号")]
         public string ErpMaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "Bom组成价格")]
-        public decimal Price { set; get; }
         [ExporterHeader(DisplayName = "总成定价")]
+        public decimal Price { set; get; }
+        [ExporterHeader(DisplayName = "Bom组成价格")]
         public decimal SumPrice { get; set; }
         [ExporterHeader(DisplayName = "差额")]
         public decimal DiffPrice { get; set; }

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

@@ -174,7 +174,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             var sqlString =
 "SELECT\n" +
 "2  WMSState,\n" +
-"temp1.WMSBillNum             ,\n" +
+"temp1.WMSBillNum,\n" +
 "temp1.UnSettleVersion\t\t ,\n" +
 "temp1.CP5Time\t\t\t\t ,\n" +
 "temp1.MaterialCode\t\t\t ,\n" +
@@ -362,7 +362,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             ;
             var _query = DbConnection.Query<UnSettleDetailReport1 > (_sql, null, null, true, 1200, null); ;
 
-
+          
             var _list = _query.ToList();
 
             //_list= _list.Where(p => p.SapMaterialCode == sapCode).ToList();

src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs

@@ -97,7 +97,7 @@ namespace SettleAccount.Job.Services.Report
             var _list = _ls.Where(p => p.ParentSapMaterialCode != p.SapMaterialCode && !string.IsNullOrEmpty(p.ParentSapMaterialCode)).Where(p => !p.ParentSapMaterialCode.Contains(",")).GroupBy(p => new { p.ParentSapMaterialCode, p.ChassisNumber, p.KENNCode })
             .Select(p => p.FirstOrDefault()).ToList();
 
-            var _compareLs=_list.Where(p => p.DiffQty == 0   ).Select(p=> new { p.ChassisNumber,p.KENNCode,p.ParentSapMaterialCode });
+            var _compareLs=_list.Where(p => p.DiffQty == 0).Select(p=> new { p.ChassisNumber,p.KENNCode,p.ParentSapMaterialCode });
 
 
             var rangeList = _erpdapperRepository.GetSapList<UnSettleDiff>(_list, version, false);
@@ -329,6 +329,9 @@ namespace SettleAccount.Job.Services.Report
             //var cp7end = p_list.Where(p => p.Name == "CP7End").FirstOrDefault().Value;
             var _list = _dapper1.GetDiffReport1(DateTime.Now.Year.ToString(), begin, end, string.Empty, version, materialCode, materialGroup, sapCode);
 
+
+
+            
             //foreach (var itm in _list)
             //{
             //    if (itm.UnSettleQty > 0)