|
@@ -237,6 +237,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
|
|
|
List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderId, orderIdList));
|
|
|
|
|
|
+ // 合并sku主材和包材
|
|
|
Stream<InOutStorageBom> streamList = Stream.concat(
|
|
|
orderSkuList.stream().map(item -> {
|
|
|
InOutStorageBom inOutStorageBom = new InOutStorageBom();
|
|
@@ -255,7 +256,6 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
List<Long> bomSpecIdList = streamList.map(InOutStorageBom::getBomSpecId).collect(Collectors.toList());
|
|
|
Map<Long, BomSpecBo> bomSpecBo = skuSpecService.getBomSpecBoByIdList(bomSpecIdList);
|
|
|
|
|
|
-
|
|
|
// 主材从半成品仓出库
|
|
|
InOutStorageDto semiFinishedProduct = new InOutStorageDto();
|
|
|
semiFinishedProduct.setType(InOutTypeEnum.OUT.getKey());
|