Browse Source

更新版本

master
学 赵 1 year ago
parent
commit
cac0915668
  1. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  3. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs
  4. 16
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

3
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs

@ -300,11 +300,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
{ {
[Display(Name = "五联单号")] [Display(Name = "五联单号")]
public string GroupNum { set; get; } public string GroupNum { set; get; }
[Display(Name = "生产码")] [Display(Name = "生产码")]
public string PN { set; get; } public string PN { set; get; }
[Display(Name = "零件号")] [Display(Name = "零件号")]
public string LU { set; get; } public string LU { set; get; }

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

@ -389,7 +389,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
foreach (var itm in sdtos) foreach (var itm in sdtos)
{ {
unsettle.Add(new MAIDAN_HBPO_UNSETTLED_DETAIL_DTO() { unsettle.Add(new MAIDAN_HBPO_UNSETTLED_DETAIL_DTO() {
GroupNum=itm.InvGroupNum, GroupNum=itm.SettleGroupNum,
LU=itm.LU, LU=itm.LU,
PN=itm.Extend1, PN=itm.Extend1,

3
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs

@ -48,7 +48,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
/// <exception cref="BusinessException"></exception> /// <exception cref="BusinessException"></exception>
public virtual async Task<bool> SetForwardState(string p_billNum, SettleBillState state) public virtual async Task<bool> SetForwardState(string p_billNum, SettleBillState state)
{ {
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
if (ls.Count > 1) if (ls.Count > 1)
{ {
@ -202,9 +201,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var entity = await GetMainAsync(billNum).ConfigureAwait(false); var entity = await GetMainAsync(billNum).ConfigureAwait(false);
if (entity != null) if (entity != null)
{ {
entity.State = SettleBillState.; entity.State = SettleBillState.;
await _repository.UpdateAsync(entity).ConfigureAwait(false); await _repository.UpdateAsync(entity).ConfigureAwait(false);
return true; return true;
} }

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

@ -1617,14 +1617,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupList.AddRange(mapList); groupList.AddRange(mapList);
} }
if (p_first == true) if (p_first == true)
{ {
var mng = await _hbpoMng.GetMainAsync(p_InvGroupNum); var mng = await _hbpoMng.GetMainAsync(p_InvGroupNum);
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == mng.SettleBillNum);//一次开票时查找不可结数据,追加需求
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == mng.SettleBillNum);//一次开票时查找不可结数据,追加需求
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>();
@ -1647,16 +1643,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
notDetialList.AddRange(innotls); notDetialList.AddRange(innotls);
} }
} }
} }
//invoiceBillNum = OrderNumberGenerator.GenerateOrderNumber("INV"); //invoiceBillNum = OrderNumberGenerator.GenerateOrderNumber("INV");
} }
@ -1711,10 +1699,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
notDetialList.AddRange(innotls); notDetialList.AddRange(innotls);
} }
} }
} }
decimal amt = detailList.Sum(k => k.Amt);//金额 decimal amt = detailList.Sum(k => k.Amt);//金额
decimal txtAmt = detailList.Sum(k => k.Amt) + Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税后金额 decimal txtAmt = detailList.Sum(k => k.Amt) + Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税后金额
decimal realAmt = Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税额 decimal realAmt = Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税额

Loading…
Cancel
Save