Browse Source

更新版本信息

master
学 赵 1 year ago
parent
commit
eadab159bb
  1. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  3. 9
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

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

@ -339,11 +339,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
else else
{ {
var dfirst = publist.FirstOrDefault(); var dfirst = publist.FirstOrDefault();
foreach (var itm in adjlist) foreach (var itm in adjlist)
{ {
var entity = new PUB_CAN_SA_DETAIL( var entity = new PUB_CAN_SA_DETAIL(
guid: GuidGenerator.Create(), guid: GuidGenerator.Create(),
keyCode: itm.KeyCode, keyCode: itm.KeyCode,
@ -532,7 +529,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
priceList.Add(new PriceList() { LU = itm.LU, BeginTime = itm.BeginDate, EndTime = itm.EndDate, Price = itm.Price, ClientCode = "1041", ContractNo = itm.ContractNo }); priceList.Add(new PriceList() { LU = itm.LU, BeginTime = itm.BeginDate, EndTime = itm.EndDate, Price = itm.Price, ClientCode = "1041", ContractNo = itm.ContractNo });
} }
break; break;
default: default:
priceList = _priceRepository.Where(p => p.IsCancel == false && p.ClientCode == inv.Site).ToList();//价格单 priceList = _priceRepository.Where(p => p.IsCancel == false && p.ClientCode == inv.Site).ToList();//价格单

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

@ -207,7 +207,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
ChangedTime = DateTime.Now, ChangedTime = DateTime.Now,
Qty = itm.Qty, Qty = itm.Qty,
RealPartCode = itm.RELU,//替换件 结算数据 RealPartCode->RELU RealPartCode = itm.RELU,//替换件 结算数据 RealPartCode->RELU
RealCode = itm.RELU, RealCode = itm.PN,
LogType = Entities.BQ.Vmi.VmiLogType.Type200, LogType = Entities.BQ.Vmi.VmiLogType.Type200,
ChangedQty = (flag == true) ? -itm.Qty : itm.Qty, ChangedQty = (flag == true) ? -itm.Qty : itm.Qty,
ChangedType = VmiType.Out, ChangedType = VmiType.Out,

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

@ -1304,7 +1304,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var adjdetails = p_adjlist.Where(p => ls.Contains(p.GroupNum)).ToList(); var adjdetails = p_adjlist.Where(p => ls.Contains(p.GroupNum)).ToList();
foreach (var detail in adjdetails) foreach (var detail in adjdetails)
{ {
detail.InvBillNum = key; detail.InvBillNum = key;
adjlist.Add(detail); adjlist.Add(detail);
} }
@ -1627,7 +1626,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
on new { LU = itm.LU, itm.PartCode, itm.BeginDate, itm.EndDate } equals new { itm1.LU, itm1.PartCode, itm1.BeginDate, itm1.EndDate } on new { LU = itm.LU, itm.PartCode, itm.BeginDate, itm.EndDate } equals new { itm1.LU, itm1.PartCode, itm1.BeginDate, itm1.EndDate }
join itm2 in p_adjlist on new { itm.LU, itm.SettleDate } equals new { itm2.LU, itm2.SettleDate } join itm2 in p_adjlist on new { itm.LU, itm.SettleDate } equals new { itm2.LU, itm2.SettleDate }
select itm2; select itm2;
foreach (var itm in query1) foreach (var itm in query1)
{ {
itm.InvBillNum = key; itm.InvBillNum = key;
@ -1656,16 +1654,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
groupList.AddRange(mapList); groupList.AddRange(mapList);
} }
if (p_first == true) if (p_first == true)
{ {
var settleBillnum = string.Empty; var settleBillnum = string.Empty;
if (businessType == EnumBusinessType.ZhiGongJianHBPO) if (businessType == EnumBusinessType.ZhiGongJianHBPO)
{ {
var mng = await _pubMng.GetMainAsync(p_InvGroupNum); var mng = await _pubMng.GetMainAsync(p_InvGroupNum);
settleBillnum=mng.SettleBillNum; settleBillnum = mng.SettleBillNum;
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == settleBillnum);//一次开票时查找不可结数据,追加需求 var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == settleBillnum);//一次开票时查找不可结数据,追加需求
if (notsettle != null && notsettle.Count() > 0) if (notsettle != null && notsettle.Count() > 0)
{ {
@ -1751,7 +1746,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
if (p_first == true) if (p_first == true)
{ {
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == p_InvGroupNum);//一次开票时查找不可结数据,追加需求 var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == p_InvGroupNum);//一次开票时查找不可结数据,追加需求
if (notsettle != null && notsettle.Count() > 0) if (notsettle != null && notsettle.Count() > 0)
{ {
var innotls = new List<INVOICE_NOT_SETTLE>(); var innotls = new List<INVOICE_NOT_SETTLE>();
@ -1894,7 +1888,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var invlist = new List<INVOICE_GRP>(); var invlist = new List<INVOICE_GRP>();
var salist = new List<TDetail>(); var salist = new List<TDetail>();
var adjlist = new List<PUB_ADJ_DETAIL>(); var adjlist = new List<PUB_ADJ_DETAIL>();
foreach (var itm in invoiceMap)//分组影响和 foreach (var itm in invoiceMap)//分组影响和
{ {
var key = itm.Key;//发票票号 var key = itm.Key;//发票票号

Loading…
Cancel
Save