Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

master
学 赵 1 year ago
parent
commit
c3fdc56a32
  1. 25
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

25
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

@ -526,7 +526,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
.OrderByDescending(t => t.Date)
.ThenByDescending(t => t.CreationTime)
.FirstOrDefault();
importPubSaDetail.Price = priceListEntity?.Price ?? 0;
if (priceListEntity != null)
{
importPubSaDetail.Price = priceListEntity.Price;
importPubSaDetail.ExtraProperties.TryAdd("ContractNo", priceListEntity.ContractNo);
}
});
}
#endregion
@ -599,10 +603,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
pubSaDetail.BillNum = pubSaBillNum;
pubSaDetail.Site = site;
});
//不可结算 结算分组号码(根据价格区分结算、不可结算)
var pubNotSaGroupNums = pubSaDetails.FindAll(t => t.Price == default(decimal)).Select(t => t.GroupNum).Distinct();
var pubSaDetailsCanSes = pubSaDetails.FindAll(t => pubNotSaGroupNums.Contains(t.GroupNum) == false);
var pubSaDetailsNotCanSes = pubSaDetails.FindAll(t => pubNotSaGroupNums.Contains(t.GroupNum) == true);
var pubSaDetailsCanSes = new List<PUB_SA_DETAIL>();
var pubSaDetailsNotCanSes = new List<PUB_SA_DETAIL>();
if (businessType == EnumBusinessType.ZhiGongJianHBPO)
{
pubSaDetailsCanSes = pubSaDetails.FindAll(t => t.Price != default);
pubSaDetailsNotCanSes = pubSaDetails.FindAll(t => t.Price == default);
}
else
{
//不可结算 结算分组号码(根据价格区分结算、不可结算)
var pubNotSaGroupNums = pubSaDetails.FindAll(t => t.Price == default(decimal)).Select(t => t.GroupNum).Distinct();
pubSaDetailsCanSes = pubSaDetails.FindAll(t => pubNotSaGroupNums.Contains(t.GroupNum) == false);
pubSaDetailsNotCanSes = pubSaDetails.FindAll(t => pubNotSaGroupNums.Contains(t.GroupNum) == true);
}
//可结算明细
var pubCanSaDetails = ObjectMapper.Map<List<PUB_SA_DETAIL>, List<PUB_CAN_SA_DETAIL>>(pubSaDetailsCanSes);

Loading…
Cancel
Save