| Line 657... |
Line 657... |
| 657 |
for (PendingOrder po : pendingOrders) {
|
657 |
for (PendingOrder po : pendingOrders) {
|
| 658 |
List<PendingOrderItem> pois = pendingOrderItemRepository.selectByOrderId(po.getId());
|
658 |
List<PendingOrderItem> pois = pendingOrderItemRepository.selectByOrderId(po.getId());
|
| 659 |
for (PendingOrderItem pendingOrderItem : pois) {
|
659 |
for (PendingOrderItem pendingOrderItem : pois) {
|
| 660 |
Item item = itemRepository.selectById(pendingOrderItem.getItemId());
|
660 |
Item item = itemRepository.selectById(pendingOrderItem.getItemId());
|
| 661 |
pendingOrderItem.setItemName(item.getItemDescription());
|
661 |
pendingOrderItem.setItemName(item.getItemDescription());
|
| - |
|
662 |
FofoOrderItem fofoItem = fofoOrderItemRepository.selectByPendingOrderItemId(pendingOrderItem.getId());
|
| - |
|
663 |
if (fofoItem != null) pendingOrderItem.setFofoOrderItem(fofoItem);
|
| 662 |
catalogIds.add(item.getCatalogItemId());
|
664 |
catalogIds.add(item.getCatalogItemId());
|
| 663 |
}
|
665 |
}
|
| 664 |
|
666 |
|
| 665 |
Map<Integer, JSONObject> contentMap = commonSolrService.getContentByCatalogIds(catalogIds);
|
667 |
Map<Integer, JSONObject> contentMap = commonSolrService.getContentByCatalogIds(catalogIds);
|
| 666 |
|
668 |
|
| 667 |
for (PendingOrderItem poi : pois) {
|
669 |
for (PendingOrderItem poi : pois) {
|
| 668 |
|
- |
|
| 669 |
PendingOrderDetail pendingOrderDetail = new PendingOrderDetail();
|
670 |
PendingOrderDetail pendingOrderDetail = new PendingOrderDetail();
|
| 670 |
|
- |
|
| 671 |
Item item = itemRepository.selectById(poi.getItemId());
|
671 |
Item item = itemRepository.selectById(poi.getItemId());
|
| - |
|
672 |
if(contentMap.containsKey(item.getCatalogItemId())) {
|
| 672 |
JSONObject jsonObj = contentMap.get(item.getCatalogItemId());
|
673 |
JSONObject jsonObj = contentMap.get(item.getCatalogItemId());
|
| 673 |
pendingOrderDetail.setImageUrl(jsonObj.getString("imageUrl_s"));
|
674 |
pendingOrderDetail.setImageUrl(jsonObj.getString("imageUrl_s"));
|
| - |
|
675 |
} else {
|
| - |
|
676 |
pendingOrderDetail.setImageUrl(ProfitMandiConstants.NO_IMAGE);
|
| - |
|
677 |
}
|
| 674 |
pendingOrderDetail.setBrand(item.getBrand());
|
678 |
pendingOrderDetail.setBrand(item.getBrand());
|
| 675 |
pendingOrderDetail.setColor(item.getColor());
|
679 |
pendingOrderDetail.setColor(item.getColor());
|
| 676 |
pendingOrderDetail.setPendingOrderItemId(poi.getId());
|
680 |
pendingOrderDetail.setPendingOrderItemId(poi.getId());
|
| 677 |
pendingOrderDetail.setId(poi.getOrderId());
|
681 |
pendingOrderDetail.setId(poi.getOrderId());
|
| - |
|
682 |
if(poi.getFofoOrderItem() != null && poi.getFofoOrderItem().getOrderId() > 0) pendingOrderDetail.setFofoOrderId(poi.getFofoOrderItem().getOrderId());
|
| 678 |
pendingOrderDetail.setItemId(poi.getItemId());
|
683 |
pendingOrderDetail.setItemId(poi.getItemId());
|
| 679 |
pendingOrderDetail.setModelName(item.getModelName());
|
684 |
pendingOrderDetail.setModelName(item.getModelName());
|
| 680 |
pendingOrderDetail.setModelNumber(item.getModelNumber());
|
685 |
pendingOrderDetail.setModelNumber(item.getModelNumber());
|
| 681 |
pendingOrderDetail.setQuantity(poi.getQuantity());
|
686 |
pendingOrderDetail.setQuantity(poi.getQuantity());
|
| 682 |
pendingOrderDetail.setBilledTimestamp(poi.getBilledTimestamp());
|
687 |
pendingOrderDetail.setBilledTimestamp(poi.getBilledTimestamp());
|