更新版本

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

@@ -18,11 +18,7 @@ namespace SettleAccount.Job.Services.Report
         public FisUpdateExportService(
 
          FisUpdateDapperRepository dapperRepository
-           //HQHSettledDetailDapperRepository dapperRepository,
       
-           //OutputService outputService,
-           //InputService inputService
-           //, IBlobContainer<MyFileContainer> fileContainer
            )
         {
             _dapperRepository = dapperRepository;

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

@@ -184,7 +184,7 @@ namespace SettleAccount.Job.Services
                 
 
                     //.Select(p => p.FirstOrDefault());
-                _ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList();
+                _ls = _ls.OrderBy(p => p.SapMaterialCode).ThenBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList();
 
             }
             _outputService.Export<InvoiceSettledDetailDiff>(id, _filename, _ls);

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

@@ -410,7 +410,7 @@ namespace SettleAccount.Job.Services
             //}
             _list = _list.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ThenBy(p => p.Flag).ToList();
 
-            var report2List = _ls.Select(p => new { p.MaterialGroup, DiffAmt = p.Price * p.Qty }).GroupBy(p => new { p.MaterialGroup }).Select(p => new SettleDoorPanelSumExport { MaterialGroup = p.Key.MaterialGroup, InvoiceDiffPrice = p.Sum(itm => itm.DiffAmt), Version = version });
+            var report2List = _ls.Where(p=>p.UnSettleVersion==version).Select(p => new { p.MaterialGroup, DiffAmt = p.Price * p.Qty }).GroupBy(p => new { p.MaterialGroup }).Select(p => new SettleDoorPanelSumExport { MaterialGroup = p.Key.MaterialGroup, InvoiceDiffPrice = p.Sum(itm => itm.DiffAmt), Version = version });
             return report2List.ToList();
         }
 

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

@@ -74,7 +74,7 @@ namespace SettleAccount.Job.Services.Report
                 var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
                 if (_groupList.Count() > 0)
                 {
-                    _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
+                    _ls = _ls.Where(p => _groupList.Contains(p.物料组车型)).ToList();
                 }
             }
             if (!string.IsNullOrEmpty(materialCode))
@@ -82,15 +82,15 @@ namespace SettleAccount.Job.Services.Report
                 var _groupList = materialCode.Split(new char[] { ',' }).Distinct().ToList();
                 if (_groupList.Count() > 0)
                 {
-                    _ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
+                    _ls = _ls.Where(p => _groupList.Contains(p.物料号)).ToList();
                 }
             }
 
             var _first = exportName.FirstOrDefault();
             ExcelExporter _exporter = new ExcelExporter();//导出Excel
-            var result = _exporter.Append(_ls.ToList(), "汇总表")
+            var result = _exporter.Append(_ls.ToList(), "未结明细表")
             .SeparateBySheet()
-            .Append(_lst.ToList(), "完成清单表")
+            .Append(_lst.ToList(), "结算出库汇总表")
             .ExportAppendDataAsByteArray();
             result.ShouldNotBeNull();
             _fileContainer.SaveAsync(_first, result.Result, true);