Browse Source

更新版本

master
zhaoxinyu 4 months ago
parent
commit
7f3c8af712
  1. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
  2. 29
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  3. 7
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

4
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@ -203,10 +203,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
List<HBPO_NOT_SA_DETAIL> notList = new List<HBPO_NOT_SA_DETAIL>();
var entites = _detailRepository.Where(p => p.BillNum == selttleBilNum).ToList();
var main = _repository.FirstOrDefault(p => p.BillNum == selttleBilNum);
if (main.State != SettleBillState.)
{

29
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

@ -898,8 +898,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
private async Task CreateBBACTaskAsync(List<string> invoiceGrps)
{
var invDetails = await _settleAccountDbContext.Set<BBAC_CAN_SA_DETAIL>().Where(p => invoiceGrps.Contains(p.InvbillNum)).AsNoTracking().ToListAsync().ConfigureAwait(false);
foreach (var itm in invoiceGrps)
{
@ -1005,10 +1003,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
private async Task CreateHBPOTaskAsync(List<string> invoiceGrps)
{
var invDetails=await _settleAccountDbContext.Set<HBPO_CAN_SA_DETAIL>().Where(p =>invoiceGrps.Contains(p.InvbillNum)).AsNoTracking().ToListAsync().ConfigureAwait(false);
var invDetails=await _settleAccountDbContext.Set<HBPO_CAN_SA_DETAIL>().Where(p =>invoiceGrps.Contains(p.InvbillNum)).AsNoTracking().ToListAsync().ConfigureAwait(false);
foreach (var itm in invoiceGrps)
{
var ls = invDetails.Where(p => p.InvbillNum == itm).ToList();
@ -1091,9 +1086,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
}
}
}
private async Task CreatePubHongChongTaskAsync(List<string> invoiceGrps)
{
// 对发票组进行处理
@ -2073,25 +2065,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
return new JsonResult(new { Code = 200, Message = "退回成功" }); ;
}
/// <summary>
/// 同步QAD
/// </summary>

7
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@ -1383,11 +1383,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var locs = locList.Select(p => p.Description).ToList();
if (p_list.Any(p => !locs.Contains(p.ToErpLocCode)))
{
return "发运数据有不在" + string.Join(",", locs) + "库位中";
}
return "ok";
}
@ -1792,6 +1789,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
using var context = new SettleAccountDbContext(options);
var st = new Stopwatch();
st.Start();
try
{
//导入日志和消息

Loading…
Cancel
Save