|
|
@@ -716,10 +716,16 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
|
|
|
if ("CNY".equals(item.getCurCode())) {
|
|
|
finAccBills.setStlAmountDr(finAccBills.getStlAmountDr().add(item.getCurrentStlAmount().add(item.getCurrentStlDiscount())));
|
|
|
finAccBills.setStlAmountDrLoc(finAccBills.getStlAmountDrLoc().add(item.getCurrentStlAmount().add(item.getCurrentStlDiscount())));
|
|
|
+ if (ids.size() > 0) {
|
|
|
+ finAccBills.setAppliedAmountStl(finAccBills.getAppliedAmountStl().add(item.getCurrentStlAmount()));
|
|
|
+ }
|
|
|
} else {
|
|
|
finAccBills.setStlAmountDrUsd(finAccBills.getStlAmountDrUsd().add(item.getCurrentStlAmount().add(item.getCurrentStlDiscount())));
|
|
|
BigDecimal cny = bCurrencyService.converterCny(item.getCurCode(), item.getCurrentStlAmount().add(item.getCurrentStlDiscount()), "D");
|
|
|
finAccBills.setStlAmountDrLoc(finAccBills.getStlAmountDrLoc().add(cny));
|
|
|
+ if (ids.size() > 0) {
|
|
|
+ finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStl().add(item.getCurrentStlAmount()));
|
|
|
+ }
|
|
|
}
|
|
|
if (finAccBills.getAmountDr().compareTo(finAccBills.getStlAmountDr()) == 0 &&
|
|
|
finAccBills.getAmountDrUsd().compareTo(finAccBills.getStlAmountDrUsd()) == 0) {
|