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

更新版本

branch_ccpg_220107
Administrator 3 years ago
parent
ccdb2473b4
commit
2c95b45c02
18 changed files with 6584 additions and 231 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. 6269
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211230.txt
  2. 35
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Reports/ReportRequestDto/ReportRequestDto.cs
  3. 135
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
  4. 8
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
  5. 8
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
  6. 211
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  7. 14
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  8. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/TaskJobs/TEA_TASK_SUB.cs
  9. 50
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs
  10. 7
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs
  11. 8
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
  12. 3
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs
  13. 24
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs
  14. 9
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs
  15. 2
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs
  16. 13
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs
  17. 9
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
  18. 8
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs

6269
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211230.txt
View File

File diff suppressed because it is too large

35
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Reports/ReportRequestDto/ReportRequestDto.cs
View File

@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Win.Sfs.SettleAccount.Reports.ReportRequestDto
{
public class BaseRequestDto
{
public string Version { set; get; }
public string MaterialCode { set; get; }
public string Begin { set; get; }
public string End { set; get; }
public string Cp7Begin { set; get; }
public string Cp7End { set; get; }
public string Kenncode { set; get; }
public string ChassisNumber { set; get; }
public string MaterialGroup { set; get; }
public string SapCode { set; get; }
}
public class BaseKanbanReqestDto
{
public string KanBan {set;get;}
public string SapMaterialCode {set;get;}
public string Version {set;get;}
public string CustomerCode {set;get;}
public string CustomerPartCode {set;get;}
public string EstimateTypeDesc {set;get;}
public string State {set;get;}
public DateTime Begin {set;get;}
public DateTime End { set; get; }
}
}

135
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
View File

@ -56,7 +56,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[AllowAnonymous] [AllowAnonymous]
[Route("api/settleaccount/wmsjitoutput")] [Route("api/settleaccount/wmsjitoutput")]
public class WMSJitAppService : public class WMSJitAppService :
ApplicationService ApplicationService
{ {
private readonly ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> _wmsRepository; private readonly ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> _wmsRepository;
@ -66,14 +66,14 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job; private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
private readonly IExcelImportAppService _excelImportService; private readonly IExcelImportAppService _excelImportService;
private readonly TaskJobService _service; private readonly TaskJobService _service;
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
/// <param name="wmsRepository"></param> /// <param name="wmsRepository"></param>
/// <param name="job"></param> /// <param name="job"></param>
/// <param name="wmsVersionRepository"></param> /// <param name="wmsVersionRepository"></param>
/// <param name="wmsefRespository"></param> /// <param name="wmsefRespository"></param>
/// <param name="wmstbRespository"></param> /// <param name="wmstbRespository"></param>
public WMSJitAppService( public WMSJitAppService(
IExcelImportAppService excelImportService, IExcelImportAppService excelImportService,
ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> wmsRepository, ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> wmsRepository,
@ -81,7 +81,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
ISettleAccountBranchEfCoreRepository<WmsJitOutPut, Guid> wmsVersionRepository, ISettleAccountBranchEfCoreRepository<WmsJitOutPut, Guid> wmsVersionRepository,
WMSEfCoreRepository<WmsJitOutPutDetial> wmsefRespository, WMSEfCoreRepository<WmsJitOutPutDetial> wmsefRespository,
WMSEfCoreRepository<TB_BILL> wmstbRespository WMSEfCoreRepository<TB_BILL> wmstbRespository
) )
{ {
_job = job; _job = job;
_wmstbRespository = wmstbRespository; _wmstbRespository = wmstbRespository;
@ -161,7 +161,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
private async Task<long> GetCountAsync(WmsJitOutPutDetialRequestDto input) private async Task<long> GetCountAsync(WmsJitOutPutDetialRequestDto input)
{ {
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
@ -172,22 +172,22 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters); return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
} }
/// <summary> /// <summary>
/// 准时化出库主表 /// 准时化出库主表
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("WmsJitList")] [Route("WmsJitList")]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)] //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
virtual public async Task<PagedResultDto<WmsJitOutPut>> GetListAsync( WmsJitOutPutRequestDto input) virtual public async Task<PagedResultDto<WmsJitOutPut>> GetListAsync(WmsJitOutPutRequestDto input)
{ {
var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
input.SkipCount, true); input.SkipCount, true);
var totalCount = await GetCountAsync(input); var totalCount = await GetCountAsync(input);
return new PagedResultDto<WmsJitOutPut>(totalCount, entities); return new PagedResultDto<WmsJitOutPut>(totalCount, entities);
} }
@ -203,7 +203,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
virtual public async Task<PagedResultDto<WmsJitOutPutDetial>> GetListAsync(WmsJitOutPutDetialRequestDto input) virtual public async Task<PagedResultDto<WmsJitOutPutDetial>> GetListAsync(WmsJitOutPutDetialRequestDto input)
{ {
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value =input.BillNum }); input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
input.SkipCount, true); input.SkipCount, true);
@ -223,13 +223,13 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
public async Task<bool> WmsJitAudit(List<Guid> ids) public async Task<bool> WmsJitAudit(List<Guid> ids)
{ {
var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync(); var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
foreach (var itm in _joblist) foreach (var itm in _joblist)
{ {
itm.FileName = "已确认"; itm.FileName = "已确认";
await _job.UpdateAsync(itm); await _job.UpdateAsync(itm);
} }
return true; return true;
} }
@ -244,7 +244,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
public async Task<bool> WmsJitCancel(List<Guid> ids) public async Task<bool> WmsJitCancel(List<Guid> ids)
{ {
var _joblist = await _job.Where(p => ids.Contains(p.Id) && p.FileName=="已确认").ToListAsync(); var _joblist = await _job.Where(p => ids.Contains(p.Id) && p.FileName == "已确认").ToListAsync();
foreach (var itm in _joblist) foreach (var itm in _joblist)
{ {
itm.FileName = "取消确认"; itm.FileName = "取消确认";
@ -253,15 +253,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
return true; return true;
} }
/// <summary> /// <summary>
/// 选择任务，生成出库单，只包含已确认的单据 /// 选择任务，生成出库单，只包含已确认的单据
/// </summary> /// </summary>
@ -273,7 +264,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
public async Task<string> WmsJitOutPut(WmsJitRequestDto input) public async Task<string> WmsJitOutPut(WmsJitRequestDto input)
{ {
var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss"); var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss");
var _joblist=_job.Where(p => input.Guids.Contains(p.Id) && p.FileName== "已确认").ToList(); var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
if (_joblist.Count() > 0) if (_joblist.Count() > 0)
{ {
var fileList = _joblist.Select(p => p.RealDownFileName).ToList(); var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
@ -303,41 +294,69 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
itm.ParentMaterialCode, itm.ParentMaterialCode,
itm.BillNum, itm.BillNum,
GuidGenerator.Create() GuidGenerator.Create()
,string.Empty , string.Empty
,itm.Qty , itm.Qty
); );
_lsCopy.Add(_detail); _lsCopy.Add(_detail);
} }
_lst.AddRange(_lsCopy.ToArray()); _lst.AddRange(_lsCopy.ToArray());
} }
var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
var outPutDetail = await _wmsRepository.Where(p => p.Version ==input.Version).ToListAsync(); var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
var query = from itm1 in _ls1
join itm2 in outPutDetail on var error = from itm1 in outPutDetail
join itm2 in _ls1 on
new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber } new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber }
equals equals
new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } into temp1 new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber }
from tm1 in temp1.DefaultIfEmpty()
where tm1 == null
select itm1; select itm1;
var _wmslst = query.ToList(); var errList= error.GroupBy(p => new { p.BillNum }).Select(p => new {BillNum=p.Key.BillNum,Number=p.Sum(itm=>itm.Qty) });
foreach (var itm in _wmslst) if (errList.Count() == 0)
{
itm.BillNum = _billNum;
}
await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0 , BatchSize=10000});
int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum==_billNum);
if (_count == 0)
{ {
var _version = new WmsJitOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email); var query = from itm1 in _ls1
//var _ls = new List<WmsJitOutPut>(); join itm2 in outPutDetail on
//_ls.Add(_version); new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber }
await _wmsVersionRepository.InsertAsync(_version, true); equals
new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } into temp1
from tm1 in temp1.DefaultIfEmpty()
where tm1 == null
select itm1;
var _wmslst = query.ToList();
foreach (var itm in _wmslst)
{
itm.BillNum = _billNum;
}
await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
if (_count == 0)
{
var _version = new WmsJitOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
//var _ls = new List<WmsJitOutPut>();
//_ls.Add(_version);
await _wmsVersionRepository.InsertAsync(_version, true);
}
foreach (var job in _joblist)
{
job.FileName = _billNum;
await _job.UpdateAsync(job);
}
} }
foreach (var job in _joblist) else
{ {
job.FileName = _billNum; StringBuilder _buffer = new StringBuilder();
await _job.UpdateAsync(job); foreach (var itm in errList)
{
_buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
}
var _errinfo= _buffer.ToString();
foreach (var job in _joblist)
{
job.FileName =_errinfo;
await _job.UpdateAsync(job);
}
} }
} }
else else
@ -365,7 +384,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
} }
else else
{ {
_ls = await _wmsRepository.Where(p => p.Version ==input.Version && p.BillNum==input.BillNum && p.State != 2).ToListAsync(); _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
} }
if (_ls.Count() > 0) if (_ls.Count() > 0)
{ {
@ -398,7 +417,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
} }
} }
return true; return true;
} }
/// <summary> /// <summary>

8
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
View File

@ -148,7 +148,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// </summary> /// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param> /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsKanbanOutPutAudit")] [Route("WmsKanbanOutPutAudit")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
@ -176,7 +176,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="ids"></param> /// <param name="ids"></param>
/// <param name="version"></param> /// <param name="version"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsKanbanOutPut")] [Route("WmsKanbanOutPut")]
public async Task<string> WmsKanbanOutPut(WmsJitRequestDto input) public async Task<string> WmsKanbanOutPut(WmsJitRequestDto input)
{ {
@ -241,7 +241,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="version"></param> /// <param name="version"></param>
/// <param name="p_list"></param> /// <param name="p_list"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsKanbanOutPut-Pass")] [Route("WmsKanbanOutPut-Pass")]
public async Task<bool> WmsKanbanOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsKanbanOutPutPass(WmsJitRequestDto input)
{ {
@ -288,7 +288,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="ids"></param> /// <param name="ids"></param>
/// <param name="version"></param> /// <param name="version"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsKanbanOutPut-Cancel")] [Route("WmsKanbanOutPut-Cancel")]
public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
{ {

8
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
View File

@ -146,7 +146,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// </summary> /// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param> /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsSharePartOutPutAudit")] [Route("WmsSharePartOutPutAudit")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
@ -174,7 +174,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="ids"></param> /// <param name="ids"></param>
/// <param name="version"></param> /// <param name="version"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsSharePartOutPut")] [Route("WmsSharePartOutPut")]
@ -242,7 +242,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="version"></param> /// <param name="version"></param>
/// <param name="p_list"></param> /// <param name="p_list"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsSharePartOutPut-Pass")] [Route("WmsSharePartOutPut-Pass")]
public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
{ {
@ -289,7 +289,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <param name="ids"></param> /// <param name="ids"></param>
/// <param name="version"></param> /// <param name="version"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("WmsSharePartOutPut-Cancel")] [Route("WmsSharePartOutPut-Cancel")]
public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input) public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
{ {

211
src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
View File

@ -28,6 +28,7 @@ using Win.Sfs.SettleAccount.Entities.TaskJobs;
using Win.Sfs.SettleAccount.Entities.Wms; using Win.Sfs.SettleAccount.Entities.Wms;
using Win.Sfs.SettleAccount.Entities.WMS; using Win.Sfs.SettleAccount.Entities.WMS;
using Win.Sfs.SettleAccount.FISes; using Win.Sfs.SettleAccount.FISes;
using Win.Sfs.SettleAccount.Reports.ReportRequestDto;
namespace Win.Sfs.SettleAccount.Reports.ReportServices namespace Win.Sfs.SettleAccount.Reports.ReportServices
{ {
@ -87,35 +88,26 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// <param name="sapCode">厂内物料号</param> /// <param name="sapCode">厂内物料号</param>
/// <param name="estimateTypeDesc">物料组</param> /// <param name="estimateTypeDesc">物料组</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("SettleDoorPanel")] [Route("SettleDoorPanel")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> SettleDoorPanel( public async Task<string> SettleDoorPanel(
string version, BaseRequestDto input
string materialCode,
string begin,
string end,
string cp7begin,
string cp7end,
string kenncode,
string chassisNumber,
string materialGroup,
string sapCode
) )
{ {
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(version) ? string.Empty : version }); customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(input.Version) ? string.Empty : input.Version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(materialCode) ? string.Empty : materialCode }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(input.MaterialCode) ? string.Empty : input.MaterialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : begin }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(input.Begin) ? string.Empty : input.Begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : end }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(input.End) ? string.Empty : input.End });
customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(cp7begin) ? string.Empty : cp7begin }); customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(input.Cp7Begin) ? string.Empty : input.Cp7Begin });
customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(cp7end) ? string.Empty : cp7end }); customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(input.Cp7End) ? string.Empty : input.Cp7End });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode }); customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(input.Kenncode) ? string.Empty : input.Kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber }); customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(input.ChassisNumber) ? string.Empty : input.ChassisNumber });
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup });
customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(sapCode) ? string.Empty : sapCode }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode });
var _taskid = await _service.ExportEnqueueAsync("准时化结算门板价格差异比对报表", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(SettleDoorPanelExportService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("准时化结算门板价格差异比对报表", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(SettleDoorPanelExportService), customConditionList, (rs) =>
{ {
}); });
return _taskid; return _taskid;
@ -133,26 +125,25 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// <param name="begin"></param> /// <param name="begin"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("SettleKanBan-WithCode")] [Route("SettleKanBan-WithCode")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> SettledKanBanWithCode(string kanBan, string sapMaterialCode, string version, string customerCode, string customerPartCode, string estimateTypeDesc, public async Task<string> SettledKanBanWithCode(BaseKanbanReqestDto input)
string state, DateTime begin, DateTime end)
{ {
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version ?? string.Empty });
customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = input.CustomerCode ?? string.Empty });
customConditionList.Add(new CustomCondition() { Name = "CustomerPartCode", Value = customerPartCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "CustomerPartCode", Value = input.CustomerPartCode ?? string.Empty });
customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" }); customConditionList.Add(new CustomCondition() { Name = "State", Value = input.State ?? "0" });
customConditionList.Add(new CustomCondition() { Name = "EstimateTypeDesc", Value = estimateTypeDesc ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "EstimateTypeDesc", Value = input.EstimateTypeDesc ?? string.Empty });
customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "有条码看板结算核对" }); customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "有条码看板结算核对" });
customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = kanBan ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.KanBan ?? string.Empty });
customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = sapMaterialCode ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = input.SapMaterialCode ?? string.Empty });
customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = begin.ToString() }); customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin.ToString() });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end.ToString() }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.ToString() });
var _taskid = await _service.ExportEnqueueAsync("大众看板结算与交货核对明细表", ExportExtentsion.Excel,version ,string.Empty,CurrentUser, typeof(SettleKBWithCodeExportService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("大众看板结算与交货核对明细表", ExportExtentsion.Excel,input.Version ,string.Empty,CurrentUser, typeof(SettleKBWithCodeExportService), customConditionList, (rs) =>
{ {
}); });
return _taskid; return _taskid;
@ -326,7 +317,9 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
[Route("InvoiceSettledDiff-Make")] [Route("InvoiceSettledDiff-Make")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> InvoiceSettledDiffMake(string year, string period, string version,string sapCode, string customerCode, string factory, string matialCode, string state) public async Task<string> InvoiceSettledDiffMake(
string year, string period, string version,string sapCode, string customerCode, string factory, string matialCode, string state
)
{ {
//if (!_settleAccountVersionrepository.Any(p => p.Version == version)) //if (!_settleAccountVersionrepository.Any(p => p.Version == version))
//{ //{
@ -354,42 +347,28 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// </summary> /// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param> /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("InvoiceSettledDetailDiff-Make")] [Route("InvoiceSettledDetailDiff-Make")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> InvoiceSettledDetailDiffMake( public async Task<string> InvoiceSettledDetailDiffMake(
string version, BaseRequestDto request
string materialCode,
string begin,
string end,
string cp7begin,
string cp7end,
string kenncode,
string chassisNumber,
string materialGroup,
string sapCode
) )
{ {
//string str1 = string.Empty;
//if(materialGroup!=null)
//{
// str1 = string.Join(',', materialGroup.ToArray());
//}
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value =string.IsNullOrEmpty(version) ?string.Empty:version }); customConditionList.Add(new CustomCondition() { Name = "Version", Value =string.IsNullOrEmpty(request.Version) ?string.Empty:request.Version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(materialCode) ?string.Empty: materialCode }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(request.MaterialCode) ?string.Empty: request.MaterialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : begin }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(request.Begin) ? string.Empty : request.Begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : end }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(request.End) ? string.Empty : request.End });
customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(cp7begin) ? string.Empty : cp7begin }); customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(request.Cp7Begin) ? string.Empty : request.Cp7Begin });
customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(cp7end) ? string.Empty : cp7end }); customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(request.Cp7End) ? string.Empty : request.Cp7End });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode }); customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(request.Kenncode) ? string.Empty : request.Kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber }); customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(request.ChassisNumber) ? string.Empty : request.ChassisNumber });
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(request.MaterialGroup) ? string.Empty : request.MaterialGroup });
customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(sapCode) ? string.Empty : sapCode }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(request.SapCode) ? string.Empty : request.SapCode });
var _taskid = await _service.ExportEnqueueAsync("准时化结算核对明细", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(InvoiceSettledDetailDiffExportService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("准时化结算核对明细", ExportExtentsion.Excel,request.Version, string.IsNullOrEmpty(request.MaterialGroup) ? string.Empty : request.MaterialGroup, CurrentUser, typeof(InvoiceSettledDetailDiffExportService), customConditionList, (rs) =>
{ {
}); });
return _taskid; return _taskid;
@ -400,36 +379,30 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// </summary> /// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param> /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("UnInvoiceSettledDetailDiff-Make")] [Route("UnInvoiceSettledDetailDiff-Make")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> UnInvoiceSettledDetailDiffMake( public async Task<string> UnInvoiceSettledDetailDiffMake(
string version,
string materialCode,
string begin, BaseRequestDto request
string end,
string cp7begin,
string cp7end,
string kenncode,
string chassisNumber,
string materialGroup,
string sapCode
) )
{ {
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(version) ? string.Empty : version }); customConditionList.Add(new CustomCondition() { Name = "Version", Value = string.IsNullOrEmpty(request.Version) ? string.Empty : request.Version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(materialCode) ? string.Empty : materialCode }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(request.MaterialCode) ? string.Empty : request.MaterialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : materialCode }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(request.Begin) ? string.Empty : request.Begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : materialCode }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(request.End) ? string.Empty : request.End });
customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(cp7begin) ? string.Empty : cp7begin }); customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(request.Cp7Begin) ? string.Empty : request.Cp7Begin });
customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(cp7end) ? string.Empty : cp7end }); customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(request.Cp7End) ? string.Empty : request.Cp7End });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode }); customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(request.Kenncode) ? string.Empty : request.Kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber }); customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(request.ChassisNumber) ? string.Empty : request.ChassisNumber });
customConditionList.Add(new CustomCondition() { Name = "Mater", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber });
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(request.MaterialGroup) ? string.Empty : request.MaterialGroup });
customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(sapCode) ? string.Empty : sapCode }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(request.SapCode) ? string.Empty : request.SapCode });
var _taskid = await _service.ExportEnqueueAsync("准时化结算数量差异比对输出", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(UnInvoiceSettledDetailDiffExportService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("准时化结算数量差异比对输出", ExportExtentsion.Excel,request.Version, string.IsNullOrEmpty(request.MaterialGroup) ? string.Empty : request.MaterialGroup, CurrentUser, typeof(UnInvoiceSettledDetailDiffExportService), customConditionList, (rs) =>
{ {
}); });
return _taskid; return _taskid;
@ -444,33 +417,28 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// </summary> /// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param> /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("UnsettledDetailReportService-Make")] [Route("UnsettledDetailReportService-Make")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> UnsettledDetailReportServiceMake( public async Task<string> UnsettledDetailReportServiceMake(
string version,
string materialCode, BaseRequestDto input
string begin,
string end,
string kenncode,
string chassisNumber,
string materialGroup,
string sapCode
) )
{ {
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = !string.IsNullOrEmpty(version)?version:string.Empty }); customConditionList.Add(new CustomCondition() { Name = "Version", Value = !string.IsNullOrEmpty(input.Version) ?input.Version:string.Empty });
customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value =string.Empty }); customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value =string.Empty });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = !string.IsNullOrEmpty(materialCode)?materialCode:string.Empty }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = !string.IsNullOrEmpty(input.MaterialCode)? input.MaterialCode :string.Empty });
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = !string.IsNullOrEmpty(materialGroup)? materialGroup:string.Empty }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = !string.IsNullOrEmpty(input.MaterialGroup)? input.MaterialGroup :string.Empty });
customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value =string.Empty }); customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value =string.Empty });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = !string.IsNullOrEmpty(materialCode)?materialCode:string.Empty });
customConditionList.Add(new CustomCondition() { Name = "Begin", Value = !string.IsNullOrEmpty(begin)?string.Empty: begin }); customConditionList.Add(new CustomCondition() { Name = "Begin", Value = !string.IsNullOrEmpty(input.Begin)?string.Empty: input.Begin });
customConditionList.Add(new CustomCondition() { Name = "End", Value = !string.IsNullOrEmpty(end)?string.Empty: end }); customConditionList.Add(new CustomCondition() { Name = "End", Value = !string.IsNullOrEmpty(input.End)?string.Empty: input.End });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode }); customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(input.Kenncode) ? string.Empty : input.Kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber }); customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(input.ChassisNumber) ? string.Empty : input.ChassisNumber });
customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(sapCode) ? string.Empty : sapCode }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode });
var _taskid = await _service.ExportEnqueueAsync("准时化未结明细表", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(UnsettledDetailReportService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("准时化未结明细表", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(UnsettledDetailReportService), customConditionList, (rs) =>
{ {
}); });
return _taskid; return _taskid;
@ -482,31 +450,24 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
/// </summary> /// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param> /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
[Route("UnSettleDiffExport-Make")] [Route("UnSettleDiffExport-Make")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> UnSettleDiffExportServiceMake( public async Task<string> UnSettleDiffExportServiceMake(
string version, BaseRequestDto input
string materialCode,
string begin,
string end,
string kenncode,
string chassisNumber,
string materialGroup,
string sapCode
) )
{ {
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version }); customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = input.Begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode }); customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(input.Kenncode) ? string.Empty : input.Kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber }); customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(input.ChassisNumber) ? string.Empty : input.ChassisNumber });
customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup }); customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup });
customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(sapCode) ? string.Empty : sapCode }); customConditionList.Add(new CustomCondition() { Name = "SapCode", Value = string.IsNullOrEmpty(input.SapCode) ? string.Empty : input.SapCode });
var _taskid = await _service.ExportEnqueueAsync("准时化未结差异比对输出", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(UnSettleDiffExportService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("准时化未结差异比对输出", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(UnSettleDiffExportService), customConditionList, (rs) =>
{ {
}); });
return _taskid; return _taskid;

14
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
View File

@ -1719,7 +1719,7 @@
wms出库 wms出库
</summary> </summary>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService.#ctor(Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePartOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePartOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePartOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL})"> <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService.#ctor(Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePartOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePartOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePartOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService)">
<summary> <summary>
</summary> </summary>
@ -2840,7 +2840,7 @@
<param name="repository">仓储接口</param> <param name="repository">仓储接口</param>
<param name="cache">缓存</param> <param name="cache">缓存</param>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleDoorPanel(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleDoorPanel(Win.Sfs.SettleAccount.Reports.ReportRequestDto.BaseRequestDto)">
<summary> <summary>
大众准时化结算门板价格差异比对报表 大众准时化结算门板价格差异比对报表
</summary> </summary>
@ -2851,7 +2851,7 @@
<param name="estimateTypeDesc">物料组</param> <param name="estimateTypeDesc">物料组</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettledKanBanWithCode(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.DateTime,System.DateTime)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettledKanBanWithCode(Win.Sfs.SettleAccount.Reports.ReportRequestDto.BaseKanbanReqestDto)">
<summary> <summary>
有条码看板结算核对 有条码看板结算核对
</summary> </summary>
@ -2888,28 +2888,28 @@
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param> <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.BaseRequestDto)">
<summary> <summary>
发票与结算核对明细表 发票与结算核对明细表
</summary> </summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param> <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnInvoiceSettledDetailDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnInvoiceSettledDetailDiffMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.BaseRequestDto)">
<summary> <summary>
3.准时化结算数量差异比对表 3.准时化结算数量差异比对表
</summary> </summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param> <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnsettledDetailReportServiceMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnsettledDetailReportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.BaseRequestDto)">
<summary> <summary>
准时化未结明细表（包含漏结，漏结要有标识） 准时化未结明细表（包含漏结，漏结要有标识）
</summary> </summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param> <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnSettleDiffExportServiceMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnSettleDiffExportServiceMake(Win.Sfs.SettleAccount.Reports.ReportRequestDto.BaseRequestDto)">
<summary> <summary>
准时化未结差异比对表 准时化未结差异比对表
</summary> </summary>

2
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/TaskJobs/TEA_TASK_SUB.cs
View File

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic; using System.Collections.Generic;
namespace CK.SCP.Models.ExchangeCenterTables namespace Win.Sfs.SettleAccount.Entities
{ {
/// <summary> /// <summary>
/// ÈÎÎñ¶©Ôıí /// ÈÎÎñ¶©Ôıí

50
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs
View File

@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Win.Sfs.Shared.DomainBase;
namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan
{
public class WmsKanban: FullAuditedAggregateRootBase<Guid>
{
/// <summary>
/// 实际发货日期
/// </summary>
public DateTime BeginTime { set; get; }
/// <summary>
///
/// </summary>
public string Version { set; get; }
/// <summary>
/// 零件号
/// </summary>
public string MaterialCode { set; get; }
/// <summary>
/// 用量
/// </summary>
public decimal Qty { set; get; }
}
}

7
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs
View File

@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Win.Sfs.SettleAccount.Entities;
using Win.Sfs.SettleAccount.Entities.WMS; using Win.Sfs.SettleAccount.Entities.WMS;
using WY.NewJit.Extends.PaiGe.WMS; using WY.NewJit.Extends.PaiGe.WMS;
@ -22,7 +23,11 @@ namespace Win.Sfs.SettleAccount
{ {
#region DbSet #region DbSet
public virtual DbSet<WmsJitOutPutDetial> WmsJitOutPutDetial { get; set; } public virtual DbSet<WmsJitOutPutDetial> WmsJitOutPutDetial { get; set; }
//public virtual DbSet<TS_SORT_DETAIL> TS_SORT_DETAIL { get; set; } public virtual DbSet<TEA_TASK_SUB> TEA_TASK_SUB { get; set; }
public virtual DbSet<WmsKanbanOutPutDetial> WmsKanbanOutPutDetial { get; set; }
public virtual DbSet<WmsSharePartOutPutDetial> WmsSharePartOutPutDetial { get; set; }
#endregion #endregion
/* Add DbSet properties for your Aggregate Roots / Entities here. /* Add DbSet properties for your Aggregate Roots / Entities here.

8
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
View File

@ -130,11 +130,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
string condition = " where 1=1 "; string condition = " where 1=1 ";
if (!string.IsNullOrEmpty(materialCode)) //if (!string.IsNullOrEmpty(materialCode))
{ //{
condition += string.Format(" and d.MaterialCode in ({0}) ", materialCode); // condition += string.Format(" and d.MaterialCode in ({0}) ", materialCode);
} //}
if (!string.IsNullOrEmpty(begin)) if (!string.IsNullOrEmpty(begin))
{ {
condition += string.Format(" and a.BeginTime>='{0}' ", begin); condition += string.Format(" and a.BeginTime>='{0}' ", begin);

3
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs
View File

@ -44,6 +44,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" row_number() over(order by b.EstimateTypeDesc) as RowId ,\n" + " row_number() over(order by b.EstimateTypeDesc) as RowId ,\n" +
" c.WMSDeliveryNote,--交货单号\n" + " c.WMSDeliveryNote,--交货单号\n" +
" c.WMSActualGoodsDate,--实际发货日期\n" + " c.WMSActualGoodsDate,--实际发货日期\n" +
" a.Kanban,--条码号\n" + " a.Kanban,--条码号\n" +
" b.MaterialCode SapMaterialCode,--厂内物料号\n" + " b.MaterialCode SapMaterialCode,--厂内物料号\n" +
" b.MaterialDesc,--物料描述\n" + " b.MaterialDesc,--物料描述\n" +
@ -65,7 +66,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" LEFT JOIN Set_material AS b ON a.MaterialCode= b.CustomerPartCode\n" + " LEFT JOIN Set_material AS b ON a.MaterialCode= b.CustomerPartCode\n" +
" LEFT JOIN Set_WMSKanBanSettle c ON a.Kanban= c.Kanban \n" + " LEFT JOIN Set_WMSKanBanSettle c ON a.Kanban= c.Kanban \n" +
" AND a.MaterialCode= c.MaterialCode\n" + " AND a.MaterialCode= c.MaterialCode\n" +
" LEFT JOIN ( SELECT SUM ( amt ) / SUM ( Qty ) InvoicePrice, MaterialCode FROM set_invoice WHERE version = '{0}' GROUP BY materialcode ) d ON a.MaterialCode= d.MaterialCode \n" + " LEFT JOIN ( SELECT SUM ( amt ) / SUM ( Qty ) InvoicePrice, MaterialCode FROM set_invoice WHERE version = '{0}' GROUP BY materialcode ) d ON a.MaterialCode= d.MaterialCode where a.VERSION='{0}'\n" +
" ) TEMP1\n" + " ) TEMP1\n" +
" LEFT JOIN ( SELECT Price, --定价\n" + " LEFT JOIN ( SELECT Price, --定价\n" +
" MaterialCode --厂内物料号\n" + " MaterialCode --厂内物料号\n" +

24
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs
View File

@ -124,10 +124,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
string condition = " where 1=1 "; string condition = " where 1=1 ";
if (!string.IsNullOrEmpty(materialCode)) //if (!string.IsNullOrEmpty(materialCode))
{ //{
condition += string.Format(" and d.MaterialCode='{0}' ", materialCode); // condition += string.Format(" and d.MaterialCode='{0}' ", materialCode);
} //}
if (!string.IsNullOrEmpty(begin)) if (!string.IsNullOrEmpty(begin))
{ {
condition += string.Format(" and a.BeginTime>='{0}' ", begin); condition += string.Format(" and a.BeginTime>='{0}' ", begin);
@ -137,14 +137,14 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
condition += string.Format(" and a.BeginTime<='{0}' ", end); condition += string.Format(" and a.BeginTime<='{0}' ", end);
} }
if (!string.IsNullOrEmpty(kennCode)) //if (!string.IsNullOrEmpty(kennCode))
{ //{
condition += string.Format(" and a.kenncode='{0}' ", kennCode); // condition += string.Format(" and a.kenncode='{0}' ", kennCode);
} //}
if (!string.IsNullOrEmpty(chassisNumber)) //if (!string.IsNullOrEmpty(chassisNumber))
{ //{
condition += string.Format(" and a.chassisNumber='{0}' ", chassisNumber); // condition += string.Format(" and a.chassisNumber='{0}' ", chassisNumber);
} //}
string sql1 = string sql1 =
"SELECT\n" + "SELECT\n" +

9
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs
View File

@ -147,6 +147,14 @@ namespace SettleAccount.Job.Services
_ls = _ls.Where(p => _groupList.Contains(p.ChassisNumber)).ToList(); _ls = _ls.Where(p => _groupList.Contains(p.ChassisNumber)).ToList();
} }
} }
if (!string.IsNullOrEmpty(materialCode))
{
var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();
if (_groupList.Count() > 0)
{
_ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
}
}
if (!string.IsNullOrEmpty(sapCode)) if (!string.IsNullOrEmpty(sapCode))
{ {
var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList(); var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList();
@ -156,7 +164,6 @@ namespace SettleAccount.Job.Services
} }
} }
_ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList(); _ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.KENNCode).ThenBy(p => p.SapMaterialCode).ToList();
} }

2
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs
View File

@ -65,7 +65,7 @@ namespace SettleAccount.Job.Services
} }
if (!string.IsNullOrEmpty(matialCode)) if (!string.IsNullOrEmpty(matialCode))
{ {
var _groupList = matialCode.Split(new char[] { ',' }).Distinct().ToList(); var _groupList = matialCode.Split(new char[] { '\n' }).Distinct().ToList();
if (_groupList.Count() > 0) if (_groupList.Count() > 0)
{ {
_ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList(); _ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList();

13
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs
View File

@ -37,8 +37,6 @@ namespace SettleAccount.Job.Services.Report
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
var materialGroup = p_list.Where(p => p.Name == "EstimateTypeDesc").FirstOrDefault().Value; var materialGroup = p_list.Where(p => p.Name == "EstimateTypeDesc").FirstOrDefault().Value;
var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value; var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value;
var beginTime = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value; var beginTime = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value;
var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
@ -55,8 +53,6 @@ namespace SettleAccount.Job.Services.Report
_first.SumDiffMoney = (_first.SettleNumber * _first.Price) - _first.InvoiceMoney;//总金额差异（结算金额-开票金额） _first.SumDiffMoney = (_first.SettleNumber * _first.Price) - _first.InvoiceMoney;//总金额差异（结算金额-开票金额）
} }
} }
if (!string.IsNullOrEmpty(materialGroup)) if (!string.IsNullOrEmpty(materialGroup))
{ {
var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList(); var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
@ -86,15 +82,11 @@ namespace SettleAccount.Job.Services.Report
if (!string.IsNullOrEmpty(beginTime)) if (!string.IsNullOrEmpty(beginTime))
{ {
_list = _list.Where(p => DateTime.Parse(beginTime)<=p.ActualGoodsDate).ToList();
_list = _list.Where(p => DateTime.Parse(beginTime)<=p.ActualGoodsDate).ToList();
} }
if (!string.IsNullOrEmpty(endTime)) if (!string.IsNullOrEmpty(endTime))
{ {
_list = _list.Where(p => DateTime.Parse(endTime) >= p.ActualGoodsDate).ToList(); _list = _list.Where(p => DateTime.Parse(endTime) >= p.ActualGoodsDate).ToList();
} }
if (!string.IsNullOrEmpty(kanban)) if (!string.IsNullOrEmpty(kanban))
@ -104,9 +96,6 @@ namespace SettleAccount.Job.Services.Report
{ {
_list = _list.Where(p => _groupList.Contains(p.Kanban)).ToList(); _list = _list.Where(p => _groupList.Contains(p.Kanban)).ToList();
} }
} }

9
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
View File

@ -128,6 +128,15 @@ namespace SettleAccount.Job.Services
_ls = _ls.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); _ls = _ls.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList();
} }
} }
if (!string.IsNullOrEmpty(materialCode))
{
var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();
if (_groupList.Count() > 0)
{
_ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
}
}
var _lsSum=_ls.GroupBy(p => new { p.MaterialCode, p.SapMaterialCode, p.MaterialGroup,p.InvoicePrice }).Select(p => new UnInvoiceSettledDetailSum var _lsSum=_ls.GroupBy(p => new { p.MaterialCode, p.SapMaterialCode, p.MaterialGroup,p.InvoicePrice }).Select(p => new UnInvoiceSettledDetailSum
{ {

8
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs
View File

@ -154,6 +154,14 @@ namespace SettleAccount.Job.Services.Report
_ls = _ls.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList(); _ls = _ls.Where(p => _groupList.Contains(p.SapMaterialCode)).ToList();
} }
} }
if (!string.IsNullOrEmpty(materialCode))
{
var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();
if (_groupList.Count() > 0)
{
_ls = _ls.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
}
}
var _id = Guid.NewGuid(); var _id = Guid.NewGuid();

Write Preview
Loading…
Cancel
Save