Browse Source

大众看板未结输出

FoShanPG
44673626 3 years ago
parent
commit
0c5bd7d4f6
  1. 1
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs
  2. 20
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs
  3. 5
      src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

1
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs

@ -186,6 +186,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
first.WmsBillNum += itm.WmsBillNum; first.WmsBillNum += itm.WmsBillNum;
first.WmsDate += itm.WmsDate; first.WmsDate += itm.WmsDate;
} }
} }
foreach (var itm in listCompare1.ToList()) foreach (var itm in listCompare1.ToList())

20
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs

@ -37,20 +37,20 @@ namespace SettleAccount.Job.Services.Report
{ {
var _filename = exportName.FirstOrDefault(); var _filename = exportName.FirstOrDefault();
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; var begin = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value;
var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; var sapCode = p_list.Where(p => p.Name == "SAPCode").FirstOrDefault().Value;
var _ls = _dapper.GetKanbanReportList(version, begin,end); var _ls = _dapper.GetKanbanReportList(version, begin,end);
// var _lst = _dapper.GetNoKanbanReportList(version, begin, end); // var _lst = _dapper.GetNoKanbanReportList(version, begin, end);
if (!string.IsNullOrEmpty(materialGroup)) //if (!string.IsNullOrEmpty(materialGroup))
{ //{
var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList(); // var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
if (_groupList.Count() > 0) // if (_groupList.Count() > 0)
{ // {
_ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList(); // _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
} // }
} //}
//if (!string.IsNullOrEmpty(materialCode)) //if (!string.IsNullOrEmpty(materialCode))
//{ //{
// var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList(); // var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();

5
src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

@ -200,6 +200,11 @@ namespace Win.Sfs.SettleAccount
{ {
return implementationFactory.GetService<WmsOutputSumExportService>(); return implementationFactory.GetService<WmsOutputSumExportService>();
} }
//大众看板未结输出
if (key.Equals(typeof(KanBanUnSettledExport).FullName))
{
return implementationFactory.GetService<KanBanUnSettledExport>();
}
else else
{ {
throw new ArgumentException($"Not Support key:{key}"); throw new ArgumentException($"Not Support key:{key}");

Loading…
Cancel
Save