|
@@ -326,8 +326,20 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
|
|
|
|
|
|
Map<Long, List<StockPreparationVo>> map = list.stream().collect(Collectors.groupingBy(StockPreparationVo::getOrderId));
|
|
|
- Map<Long, List<OrderSku>> orderSkuMap = orderSkuService.list(q -> q.in(OrderSku::getOrderId, map.keySet()))
|
|
|
- .stream().collect(Collectors.groupingBy(OrderSku::getOrderId));
|
|
|
+ List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, map.keySet()));
|
|
|
+
|
|
|
+ List<Long> skuSpecIds = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
|
|
|
+ List<Long> giftSkuSpecIds = skuSpecService.getGiftIdListByIdList(skuSpecIds);
|
|
|
+
|
|
|
+
|
|
|
+ List<Long> bomSpecIds = orderSkuList.stream().map(OrderSku::getBomSpecId).collect(Collectors.toList());
|
|
|
+ Map<Long, BomSpecBo> bomSpecBoMap = skuSpecService.getBomSpecBoByIdList(bomSpecIds);
|
|
|
+
|
|
|
+ Map<Long, List<OrderSku>> orderSkuMap = orderSkuList.stream()
|
|
|
+ .filter(item -> giftSkuSpecIds.isEmpty() || !giftSkuSpecIds.contains(item.getSkuSpecId()))
|
|
|
+ .filter(item -> bomSpecBoMap.get(item.getBomSpecId()).getClassifyParentId().equals(1L))
|
|
|
+ .collect(Collectors.groupingBy(OrderSku::getOrderId));
|
|
|
+
|
|
|
map.forEach((orderId, stockPreparationVoList) -> {
|
|
|
StockPreparationVo stockPreparationVo = stockPreparationVoList.get(0);
|
|
|
String orderCode = stockPreparationVo.getOrderCode();
|
|
@@ -380,8 +392,15 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
|
|
|
List<ProductionWorkOrder> productionWorkOrderList = new ArrayList<>();
|
|
|
Map<Long, List<StockPreparationVo>> map = list.stream().collect(Collectors.groupingBy(StockPreparationVo::getOrderId));
|
|
|
- Map<Long, List<OrderSku>> orderSkuMap = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIdList))
|
|
|
- .stream().collect(Collectors.groupingBy(OrderSku::getOrderId));
|
|
|
+ List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, map.keySet()));
|
|
|
+
|
|
|
+ List<Long> skuSpecIds = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
|
|
|
+ List<Long> giftSkuSpecIds = skuSpecService.getGiftIdListByIdList(skuSpecIds);
|
|
|
+
|
|
|
+ Map<Long, List<OrderSku>> orderSkuMap = orderSkuList.stream()
|
|
|
+ .filter(item -> giftSkuSpecIds.isEmpty() || !giftSkuSpecIds.contains(item.getSkuSpecId()))
|
|
|
+ .collect(Collectors.groupingBy(OrderSku::getOrderId));
|
|
|
+
|
|
|
map.forEach((orderId, stockPreparationVoList) -> {
|
|
|
StockPreparationVo stockPreparationVo = stockPreparationVoList.get(0);
|
|
|
String orderCode = stockPreparationVo.getOrderCode();
|
|
@@ -463,11 +482,15 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderId, orderIdList));
|
|
|
List<OrderPackageBom> orderPackageBomList = orderPackageBomService.list(q -> q.in(OrderPackageBom::getOrderId, orderIdList));
|
|
|
Map<Long, OrderSku> orderSkuMap = orderSkuList.stream().collect(Collectors.toMap(BaseIdPo::getId, Function.identity()));
|
|
|
+
|
|
|
+ List<Long> skuSpecIds = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
|
|
|
+ List<Long> giftSkuSpecIds = skuSpecService.getGiftIdListByIdList(skuSpecIds);
|
|
|
|
|
|
Map<Long, OutBomVo> map = Stream.of(
|
|
|
|
|
|
orderSkuList.stream()
|
|
|
.filter(item -> outsourceOrderIds.isEmpty() || !outsourceOrderIds.contains(item.getOrderId()))
|
|
|
+ .filter(item -> giftSkuSpecIds.isEmpty() || !giftSkuSpecIds.contains(item.getSkuSpecId()))
|
|
|
.map(item -> {
|
|
|
OutBomVo outBomVo = new OutBomVo();
|
|
|
outBomVo.setBomSpecId(item.getBomSpecId());
|
|
@@ -592,7 +615,12 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
List<Long> orderIdList = stockPreparationVoList.stream().map(StockPreparationVo::getOrderId).distinct().collect(Collectors.toList());
|
|
|
List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIdList));
|
|
|
|
|
|
+
|
|
|
+ List<Long> skuSpecIds = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
|
|
|
+ List<Long> giftSkuSpecIds = skuSpecService.getGiftIdListByIdList(skuSpecIds);
|
|
|
+
|
|
|
Map<Long, OutSkuVo> map = orderSkuList.stream()
|
|
|
+ .filter(item -> giftSkuSpecIds.isEmpty() || !giftSkuSpecIds.contains(item.getSkuSpecId()))
|
|
|
.map(item -> {
|
|
|
OutSkuVo outSkuVo = new OutSkuVo();
|
|
|
outSkuVo.setSkuSpecId(item.getSkuSpecId());
|
|
@@ -727,12 +755,16 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderId, orderIdLockStorageMap.keySet()));
|
|
|
Map<Long, OrderSku> orderSkuMap = orderSkuList.stream().collect(Collectors.toMap(BaseIdPo::getId, Function.identity()));
|
|
|
List<OrderPackageBom> orderPackageBomList = orderPackageBomService.list(q -> q.in(OrderPackageBom::getOrderId, orderIdLockStorageMap.keySet()));
|
|
|
+
|
|
|
+ List<Long> skuSpecIds = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
|
|
|
+ List<Long> giftSkuSpecIds = skuSpecService.getGiftIdListByIdList(skuSpecIds);
|
|
|
|
|
|
List<InOutStorageBomBo> inOutStorageBomBoList = Stream.of(
|
|
|
|
|
|
|
|
|
orderSkuList.stream()
|
|
|
.filter(item -> outsourceOrderIds.isEmpty() || !outsourceOrderIds.contains(item.getOrderId()))
|
|
|
+ .filter(item -> giftSkuSpecIds.isEmpty() || !giftSkuSpecIds.contains(item.getSkuSpecId()))
|
|
|
.map(item -> {
|
|
|
InOutStorageBomBo inOutStorageBom = new InOutStorageBomBo();
|
|
|
inOutStorageBom.setBomSpecId(item.getBomSpecId());
|