|
@@ -103,11 +103,11 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
|
|
stock = new Stock();
|
|
stock = new Stock();
|
|
stock.setWarehouseId(warehouseId);
|
|
stock.setWarehouseId(warehouseId);
|
|
stock.setGoodsId(goodsId);
|
|
stock.setGoodsId(goodsId);
|
|
- stock.setQuantity(changeQuantity);
|
|
|
|
|
|
+ stock.setQuantity(BigDecimal.ZERO);
|
|
stock.setFrozenQuantity(changeQuantity);
|
|
stock.setFrozenQuantity(changeQuantity);
|
|
map.put(key, stock);
|
|
map.put(key, stock);
|
|
} else {
|
|
} else {
|
|
- stock.setQuantity(stock.getQuantity().add(changeQuantity));
|
|
|
|
|
|
+// stock.setQuantity(stock.getQuantity().add(changeQuantity));
|
|
stock.setFrozenQuantity(stock.getFrozenQuantity().add(changeQuantity));
|
|
stock.setFrozenQuantity(stock.getFrozenQuantity().add(changeQuantity));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -122,7 +122,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
|
|
Stock itemStock = map.get(key);
|
|
Stock itemStock = map.get(key);
|
|
itemStock.setId(stock.getId());
|
|
itemStock.setId(stock.getId());
|
|
if (stockChangeVo.getTypeEnum() instanceof InTypeEnum) {
|
|
if (stockChangeVo.getTypeEnum() instanceof InTypeEnum) {
|
|
- itemStock.setQuantity(itemStock.getQuantity().add(stock.getQuantity()));
|
|
|
|
|
|
+// itemStock.setQuantity(itemStock.getQuantity().add(stock.getQuantity()));
|
|
itemStock.setFrozenQuantity(itemStock.getFrozenQuantity().add(stock.getFrozenQuantity()));
|
|
itemStock.setFrozenQuantity(itemStock.getFrozenQuantity().add(stock.getFrozenQuantity()));
|
|
} else {
|
|
} else {
|
|
BigDecimal quantity = itemStock.getQuantity().subtract(stock.getQuantity());
|
|
BigDecimal quantity = itemStock.getQuantity().subtract(stock.getQuantity());
|