PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

FoShanPG
Administrator 2 years ago
parent
456b48cbe2
commit
d042195a12
1 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

18
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs
View File

@ -58,7 +58,7 @@ namespace SettleAccount.Job.Services.Report
private readonly OutputService _outputService; private readonly OutputService _outputService;
private readonly ErpPartDapperRepository _erpDapper; private readonly ErpPartDapperRepository _erpDapper;
private readonly SettleSparePartDapperReportRepository _sparepartdapper; private readonly SettleSparePartDapperReportRepository _sparepartdapper;
private readonly ErpPartDapperRepository _erpdapperRepository; //private readonly ErpPartDapperRepository _erpdapperRepository;
private readonly IBlobContainer<MyFileContainer> _fileContainer; private readonly IBlobContainer<MyFileContainer> _fileContainer;
public UnSettledSumService( public UnSettledSumService(
HQHSettledDetailDapperRepository hqkanbanDapper, HQHSettledDetailDapperRepository hqkanbanDapper,
@ -68,8 +68,8 @@ namespace SettleAccount.Job.Services.Report
ErpPartDapperRepository erpDapper, ErpPartDapperRepository erpDapper,
WmsDapperRepository wmsDapper, WmsDapperRepository wmsDapper,
SettleSparePartDapperReportRepository sparepartdapper, SettleSparePartDapperReportRepository sparepartdapper,
IBlobContainer<MyFileContainer> fileContainer, IBlobContainer<MyFileContainer> fileContainer
ErpPartDapperRepository erpdapperRepository
) )
{ {
_wmsDapper = wmsDapper; _wmsDapper = wmsDapper;
@ -80,7 +80,7 @@ namespace SettleAccount.Job.Services.Report
_erpDapper = erpDapper; _erpDapper = erpDapper;
_sparepartdapper = sparepartdapper; _sparepartdapper = sparepartdapper;
_fileContainer = fileContainer; _fileContainer = fileContainer;
_erpdapperRepository = erpdapperRepository;
} }
[UnitOfWork(false)] [UnitOfWork(false)]
public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list) public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
@ -135,8 +135,8 @@ 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 = _erpdapperRepository.GetErrorBillList(); 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()
@ -287,7 +287,7 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms
} }
//应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629
var _checkList = _erpdapperRepository.GetErrorBillList(); var _checkList = _erpDapper.GetErrorBillList();
var query = from itm in _ls var query = from itm in _ls
join itm1 in _checkList on new { ChassisNumber = itm.Kanban, MaterialCode = itm.CustomerPartCode, WmsBillNum = itm.WmsBillNum } join itm1 in _checkList on new { ChassisNumber = itm.Kanban, MaterialCode = itm.CustomerPartCode, WmsBillNum = itm.WmsBillNum }
@ -356,7 +356,7 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms
} }
//应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629
var _checkList = _erpdapperRepository.GetErrorBillList(); var _checkList = _erpDapper.GetErrorBillList();
var query = from itm in _ls var query = from itm in _ls
join itm1 in _checkList on new { ChassisNumber = itm.订货看板编号, MaterialCode = itm.客户物料号, WmsBillNum = itm.交货单号 } join itm1 in _checkList on new { ChassisNumber = itm.订货看板编号, MaterialCode = itm.客户物料号, WmsBillNum = itm.交货单号 }
@ -416,7 +416,7 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms
//应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629 //应用屏蔽错误信息功能，将其屏蔽的信息从生成的列表中排除掉，20220629
var _checkList = _erpdapperRepository.GetErrorBillList(); var _checkList = _erpDapper.GetErrorBillList();
var query = from itm in _ls var query = from itm in _ls
join itm1 in _checkList on new { ChassisNumber = itm.采购订单号, MaterialCode = itm.物料代码, WmsBillNum = itm.交货单号 } join itm1 in _checkList on new { ChassisNumber = itm.采购订单号, MaterialCode = itm.物料代码, WmsBillNum = itm.交货单号 }

Write Preview
Loading…
Cancel
Save