Browse Source

更新版本

master
学 赵 1 year ago
parent
commit
bbe76e56eb
  1. 1
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
  3. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  4. 5
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  5. 17
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

1
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs

@ -178,7 +178,6 @@ namespace Win.Sfs.SettleAccount.Bases
bj.LU = itm.LU;
bj.PartCode = itm.PartCode;
bj.PRICE = itm.PRICE;
bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryNumber = itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs

@ -190,7 +190,7 @@ namespace Win.Sfs.SettleAccount.Bases
}
}
await _repository.DbContext.BulkUpdateAsync(ls);
var _taskid = await p_service.ExportEnqueueAsync($"{first.BusinessType.ToString()}待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) =>
{
});

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

@ -201,7 +201,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
bj.PRICE = itm.PRICE;
bj.InvbillNum = itm.InvbillNum;
bj.InvGroupNum = itm.InvGroupNum;
bj.DeliveryNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
bj.DeliveryIndexNumber =itm.ExtraProperties["DeliveryIndexNumber"].ToSqlValue();
bj.Qty = itm.Qty;
bj.PRICE = itm.PRICE;
bj.Amt = Math.Round(itm.PRICE * itm.Qty, 2);

5
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using EFCore.BulkExtensions;
@ -151,6 +151,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
}
Sync(detailist, EnumDeliverBjBmpBillType.JIT直供件, email, isout == "out" ? true : false);
}
return id.ToString();
}
//public List<T> GetPagedData<T>(List<T> dataList, int pageNumber, int pageSize)

17
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@ -1403,7 +1403,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
);
string site = dtos.Where(p => !string.IsNullOrEmpty(p.Site)).FirstOrDefault().Site;
string clientCode = string.Empty;
switch (site)
{
case "1040":
@ -1434,7 +1433,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
await _repository.DbContext.BulkInsertAsync(invlist).ConfigureAwait(false);
await _repository.DbContext.BulkInsertAsync(groupList).ConfigureAwait(false);
await _repository.DbContext.BulkInsertAsync(detailList).ConfigureAwait(false);
if (adjlist.Count > 0)
{
await _repository.DbContext.BulkUpdateAsync(adjlist).ConfigureAwait(false);
@ -1673,7 +1671,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{
detailList.AddRange(_entityDetailList);
}
if (p_first == true)
{
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == p_InvGroupNum);//一次开票时查找不可结数据,追加需求
@ -2223,13 +2220,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
beginDate: detail.BeginDate,
endDate: detail.EndDate,
partcode: detail.PartCode);
entity.LineCode = detail.LineCode;
entity.SetProperty("DeliveryNumber", detail.DeliveryNumber);//交货号
entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
entity.SetProperty("VendorName", detail.VendorName);//供应商名称
entity.SetProperty("PurchaseOrderNumber", "");//采购订单号
entity.SetProperty("DeliveryIndexNumber", detail.DeliveryIndexNumber);//交付索引号
entity.SetProperty("PartName", detail.PartName);//零件名称
entity.LineCode = detail.LineCode;
entity.SetProperty("DeliveryNumber", detail.DeliveryNumber);//交货号
entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
entity.SetProperty("VendorName", detail.VendorName);//供应商名称
entity.SetProperty("PurchaseOrderNumber", "");//采购订单号
entity.SetProperty("DeliveryIndexNumber", detail.DeliveryIndexNumber);//交付索引号
entity.SetProperty("PartName", detail.PartName);//零件名称
_entityDetailList.Add(entity);
}
if (_entityDetailList.Count > 0)

Loading…
Cancel
Save