|
@@ -146,10 +146,10 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
|
|
|
|
|
|
BigDecimal transactionPrice = new BigDecimal(Float.toString(purchaseOrder.getTransactionPrice()));
|
|
|
BigDecimal closeRate = new BigDecimal(Float.toString(purchaseOrder.getCloseRate()));
|
|
|
- BigDecimal closingBasis = new BigDecimal(Float.toString(Math.abs(purchaseOrder.getClosingBasis())));
|
|
|
- Float price = transactionPrice.subtract(closeRate).subtract(closingBasis).floatValue();
|
|
|
+ BigDecimal closingBasis = new BigDecimal(Float.toString(purchaseOrder.getClosingBasis()));
|
|
|
+ Float price = transactionPrice.subtract(closeRate).add(closingBasis).floatValue();
|
|
|
if(price > 0){
|
|
|
- purchaseClosingReport.setAmountIngPayable(CalculationUtil.mulToFloat(price,purchaseClosingReport.getClosingQuantity()));
|
|
|
+ purchaseClosingReport.setAmountIngPayable(CalculationUtil.mulToFloat(Math.abs(price),purchaseClosingReport.getClosingQuantity()));
|
|
|
purchaseClosingReport.setAmountEdPayable(0f);
|
|
|
purchaseClosingReport.setAmountNotPayable(purchaseClosingReport.getAmountIngPayable());
|
|
|
}
|