|
@@ -2061,7 +2061,9 @@ handlingProportion,
|
|
|
}
|
|
}
|
|
|
// 跟单生成批次表
|
|
// 跟单生成批次表
|
|
|
SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = this.saveSumSettlement(insPlyIncomeVo);
|
|
SettlementDocumentaryFeesSumEntity settlementDocumentaryFeesSumEntity = this.saveSumSettlement(insPlyIncomeVo);
|
|
|
- settlementDocumentaryFeesVo.setSettlementSumId(settlementDocumentaryFeesSumEntity.getId());
|
|
|
|
|
|
|
+ if(ObjectUtils.isNotEmpty(settlementDocumentaryFeesSumEntity)){
|
|
|
|
|
+ settlementDocumentaryFeesVo.setSettlementSumId(settlementDocumentaryFeesSumEntity.getId());
|
|
|
|
|
+ }
|
|
|
return settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
|
|
return settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -2442,7 +2444,9 @@ handlingProportion,
|
|
|
BigDecimal settlementAmount = insPlyIncomeVo.getSettlementAmount();
|
|
BigDecimal settlementAmount = insPlyIncomeVo.getSettlementAmount();
|
|
|
settlementDocumentaryFeesVo.setExpendAmount(settlementAmount.multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
|
|
settlementDocumentaryFeesVo.setExpendAmount(settlementAmount.multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
|
|
|
}
|
|
}
|
|
|
- settlementDocumentaryFeesVo.setSettlementSumId(settlementDocumentaryFeesSumEntity.getId());
|
|
|
|
|
|
|
+ if(ObjectUtils.isNotEmpty(settlementDocumentaryFeesSumEntity)){
|
|
|
|
|
+ settlementDocumentaryFeesVo.setSettlementSumId(settlementDocumentaryFeesSumEntity.getId());
|
|
|
|
|
+ }
|
|
|
settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
|
|
settlementDocumentaryFeesService.inertSettle(settlementDocumentaryFeesVo);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|