|
|
@@ -271,12 +271,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//如果以前没有选择借支,修改报销和借支数据
|
|
|
if (useEA.getDebitId()==null){
|
|
|
pushExpenseAccountDebit(in);
|
|
|
-// 修改选择抵消才触发抵扣相关计算,改为只要有编号都计算,防止后续加金额未计入金额产生BUG
|
|
|
- }else {
|
|
|
+ }else if (useEA.getDebitId()!=in.getDebitId()) {
|
|
|
//如果是修改编号
|
|
|
pushExpenseAccountDebit(in);
|
|
|
//并且要处理原编号的问题
|
|
|
pushResettingDebit(in,useEA.getDebitId());
|
|
|
+ }else {
|
|
|
+ pushExpenseAccountDebit(in);
|
|
|
}
|
|
|
}
|
|
|
if (in.getSettlementAmount()==null)in.setSettlementAmount(useEA.getSettlementAmount());
|