Browse Source

[CI SKIP]

master
学 赵 1 year ago
parent
commit
e25edec134
  1. 9
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
  2. 19
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  3. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs

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

@ -179,7 +179,14 @@ namespace Win.Sfs.SettleAccount.Bases
await _repository.DbContext.BulkDeleteAsync(pdDetailList); await _repository.DbContext.BulkDeleteAsync(pdDetailList);
foreach (var itm in pdinvList) foreach (var itm in pdinvList)
{ {
itm.State = SettleBillState.; if (itm.State == SettleBillState.QAD)
{
itm.State = SettleBillState.;
}
else
{
itm.State = SettleBillState.;
}
} }
await _repository.DbContext.BulkUpdateAsync(pdinvList);//更新发票为关联发票 await _repository.DbContext.BulkUpdateAsync(pdinvList);//更新发票为关联发票
} }

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

@ -259,10 +259,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
} }
foreach (var item in pdinvList) foreach (var item in pdinvList)
{ {
if(item.State!=SettleBillState.QAD)
{ item.State = SettleBillState.;
item.State = SettleBillState.;
}
} }
_dbcontext.BulkUpdate(pdList); _dbcontext.BulkUpdate(pdList);
_dbcontext.BulkUpdate(pdinvList); _dbcontext.BulkUpdate(pdinvList);
@ -293,10 +292,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
} }
foreach (var item in bbacinvList) foreach (var item in bbacinvList)
{ {
if (item.State != SettleBillState.QAD) //if (item.State != SettleBillState.已提交QAD)
{ //{
item.State = SettleBillState.; item.State = SettleBillState.;
} //}
} }
_dbcontext.BulkUpdate(bbacList); _dbcontext.BulkUpdate(bbacList);
_dbcontext.BulkUpdate(bbacinvList); _dbcontext.BulkUpdate(bbacinvList);
@ -327,10 +326,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
} }
foreach (var item in hbpoinvList) foreach (var item in hbpoinvList)
{ {
if (item.State != SettleBillState.QAD) // if (item.State != SettleBillState.已提交QAD)
{ // {
item.State = SettleBillState.; item.State = SettleBillState.;
} // }
} }
_dbcontext.BulkUpdate(hbpoList); _dbcontext.BulkUpdate(hbpoList);
_dbcontext.BulkUpdate(hbpoinvList); _dbcontext.BulkUpdate(hbpoinvList);

4
code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs

@ -30,7 +30,9 @@ namespace Win.Sfs.SettleAccount
[Description("撤销扣减进行中")] [Description("撤销扣减进行中")]
= 7, = 7,
[Description("已提交QAD")] [Description("已提交QAD")]
QAD = 8 QAD = 8,
[Description("红冲")]
= 9
} }
public enum PDBillState public enum PDBillState

Loading…
Cancel
Save