|
|
@@ -3196,10 +3196,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockOneR.setStoreInventory(stockOneR.getBalanceQuantity());
|
|
|
stockOneR.setInventoryAmount(stockOneR.getInventoryAmount().add(orderItems.getGoodsNum()
|
|
|
.multiply(stockOneC.getInventoryCostPrice())));
|
|
|
-// stockOneR.setInventoryCostPrice(stockOneR.getInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
+ stockOneR.setInventoryCostPrice(stockOneR.getInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
stockOneR.setRebateInventoryAmount(stockOneR.getRebateInventoryAmount().add(orderItems.getGoodsNum()
|
|
|
.multiply(stockOneC.getRebatePrice())));
|
|
|
-// stockOneR.setRebatePrice(stockOneR.getRebateInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
+ stockOneR.setRebatePrice(stockOneR.getRebateInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
stockOneR.setVersion(stockOneR.getVersion());
|
|
|
pjStockDescList.add(stockOneR);
|
|
|
} else {
|