Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
ff4f21ab5c
  1. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
  2. 6
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs
  3. 8
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs

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

@ -152,7 +152,7 @@ namespace SettleAccount.Job.Services
} }
var _checkList = _errorListRepository.ToList(); var _checkList = _erpdapperRepository.GetErrorBillList();
var query = from itm in _ls var query = from itm in _ls
join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum } join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum }

6
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

@ -135,14 +135,14 @@ namespace SettleAccount.Job.Services.Report
var datetime = date.ToShortDateString() + " 23:59:59 "; var datetime = date.ToShortDateString() + " 23:59:59 ";
var _list = _dapper.GetDiffReport(DateTime.Now.Year.ToString(), begin, datetime, "", version, materailCode, materialGroup, ""); var _list = _dapper.GetDiffReport(DateTime.Now.Year.ToString(), begin, datetime, "", version, materailCode, materialGroup, "");
var _checkList = _errorListRepository.ToList(); var _checkList =_erpDapper.GetErrorBillList();
var query = from itm in _list var q= from itm in _list
join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum } join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum }
equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, WmsBillNum = itm1.WmsBillNum } into temp1 equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, WmsBillNum = itm1.WmsBillNum } into temp1
from tm1 in temp1.DefaultIfEmpty() from tm1 in temp1.DefaultIfEmpty()
where tm1 == null where tm1 == null
select itm; select itm;
_list = query.ToList(); _list = q.ToList();
var _ls = _list.Where(p => p.Flag != "L").Where(p => p.ParentSapMaterialCode != p.SapMaterialCode).GroupBy(p => new { p.KENNCode, p.ChassisNumber, p.ParentSapMaterialCode }).Select(p => p.FirstOrDefault()).ToList(); var _ls = _list.Where(p => p.Flag != "L").Where(p => p.ParentSapMaterialCode != p.SapMaterialCode).GroupBy(p => new { p.KENNCode, p.ChassisNumber, p.ParentSapMaterialCode }).Select(p => p.FirstOrDefault()).ToList();
var _lst = _erpDapper.GetSapList(_ls, version, false); var _lst = _erpDapper.GetSapList(_ls, version, false);

8
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnsettledDetailReport.cs

@ -25,14 +25,14 @@ namespace SettleAccount.Job.Services.Report
public UnsettledDetailReportService( public UnsettledDetailReportService(
UnSettledDetailDapperRepository dapper, UnSettledDetailDapperRepository dapper,
OutputService outputService, OutputService outputService,
ErpPartDapperRepository erpDapper, ErpPartDapperRepository erpDapper
ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> errorListRepository
) )
{ {
_dapper = dapper; _dapper = dapper;
_outputService = outputService; _outputService = outputService;
_erpDapper = erpDapper; _erpDapper = erpDapper;
_errorListRepository = errorListRepository;
} }
@ -57,7 +57,7 @@ namespace SettleAccount.Job.Services.Report
var _list = _dapper.GetDiffReport(DateTime.Now.Year.ToString(), begin, end, customerCode, version,materailCode,materialGroup,sapcode); var _list = _dapper.GetDiffReport(DateTime.Now.Year.ToString(), begin, end, customerCode, version,materailCode,materialGroup,sapcode);
var _checkList = _errorListRepository.ToList(); var _checkList = _erpDapper.GetErrorBillList();
var query = from itm in _list var query = from itm in _list
join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum } join itm1 in _checkList on new { ChassisNumber = itm.ChassisNumber, MaterialCode = itm.MaterialCode, WmsBillNum = itm.WmsBillNum }

Loading…
Cancel
Save