|
|
@@ -4505,13 +4505,13 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockDesc.setRebateInventoryAmount(item.getSendNum().multiply(item.getRebatePrice()));
|
|
|
stockDesc.setInventoryCostPrice(item.getCostpriePrice());
|
|
|
stockDesc.setRebatePrice(item.getRebatePrice());
|
|
|
- /*if (stockDesc.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
|
|
|
+ if (stockDesc.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
|
|
|
stockDesc.setInventoryCostPrice(stockDesc.getInventoryAmount().divide(stockDesc.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
stockDesc.setRebatePrice(stockDesc.getRebateInventoryAmount().divide(stockDesc.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
} else {
|
|
|
stockDesc.setInventoryCostPrice(item.getPrice());
|
|
|
stockDesc.setRebatePrice(item.getRebatePrice());
|
|
|
- }*/
|
|
|
+ }
|
|
|
pjStockDescArrayListSave.add(stockDesc);
|
|
|
} else {
|
|
|
stockDesc.setId(stockOne.getId());
|