|
@@ -247,7 +247,7 @@ public class WarehouseEntryManagerImpl extends BaseServiceImpl<WarehouseEntryMap
|
|
.in(WarehouseEntryProductDO::getWarehouseEntryId, collected));
|
|
.in(WarehouseEntryProductDO::getWarehouseEntryId, collected));
|
|
List<OrderItemDO> objects = new ArrayList<>();
|
|
List<OrderItemDO> objects = new ArrayList<>();
|
|
for (OrderItemDO itemDO : list) {
|
|
for (OrderItemDO itemDO : list) {
|
|
- WarehouseEntryProductDTO warehouseEntryProductDTO = warehouseEntryDTO.getProductList().stream().filter(item -> item.getProductStockId().equals(itemDO.getProductStockId())).findFirst().get();
|
|
|
|
|
|
+ WarehouseEntryProductDTO warehouseEntryProductDTO = warehouseEntryDTO.getProductList().stream().filter(item -> item.getProductId().equals(itemDO.getProductId())).findFirst().get();
|
|
itemDO.setStockNum(itemDO.getStockNum()-warehouseEntryProductDTO.getNum());
|
|
itemDO.setStockNum(itemDO.getStockNum()-warehouseEntryProductDTO.getNum());
|
|
if (itemDO.getStockNum() <= 0){
|
|
if (itemDO.getStockNum() <= 0){
|
|
itemDO.setHasReturn(true);
|
|
itemDO.setHasReturn(true);
|