| Line 2359... |
Line 2359... |
| 2359 |
InventoryItem::getItemId,
|
2359 |
InventoryItem::getItemId,
|
| 2360 |
Collectors.mapping(InventoryItem::getSerialNumber, Collectors.toList())
|
2360 |
Collectors.mapping(InventoryItem::getSerialNumber, Collectors.toList())
|
| 2361 |
));
|
2361 |
));
|
| 2362 |
|
2362 |
|
| 2363 |
List<InStockItemDetailModel> inStockItemDetailModels = new ArrayList<>();
|
2363 |
List<InStockItemDetailModel> inStockItemDetailModels = new ArrayList<>();
|
| - |
|
2364 |
|
| - |
|
2365 |
// Add in-stock items
|
| 2364 |
for (CurrentInventorySnapshot snap : currentInventorySnapshots) {
|
2366 |
for (CurrentInventorySnapshot snap : currentInventorySnapshots) {
|
| 2365 |
InStockItemDetailModel inStockItemDetailModel = new InStockItemDetailModel();
|
2367 |
InStockItemDetailModel inStockItemDetailModel = new InStockItemDetailModel();
|
| 2366 |
inStockItemDetailModel.setAvailability(snap.getAvailability());
|
2368 |
inStockItemDetailModel.setAvailability(snap.getAvailability());
|
| 2367 |
inStockItemDetailModel.setItemId(snap.getItemId());
|
2369 |
inStockItemDetailModel.setItemId(snap.getItemId());
|
| 2368 |
inStockItemDetailModel.setCatalogId(itemMap.get(snap.getItemId()).getCatalogItemId());
|
2370 |
inStockItemDetailModel.setCatalogId(itemMap.get(snap.getItemId()).getCatalogItemId());
|
| 2369 |
inStockItemDetailModel.setItemDescription(itemMap.get(snap.getItemId()).getItemDescription());
|
2371 |
inStockItemDetailModel.setItemDescription(itemMap.get(snap.getItemId()).getItemDescription());
|
| 2370 |
inStockItemDetailModel.setFofoId(snap.getFofoId());
|
2372 |
inStockItemDetailModel.setFofoId(snap.getFofoId());
|
| - |
|
2373 |
inStockItemDetailModel.setStockType("IN_STOCK");
|
| 2371 |
// Check if this item has any activated but not sold IMEIs and set the IMEI list
|
2374 |
// Check if this item has any activated but not sold IMEIs and set the IMEI list
|
| 2372 |
List<String> activatedImeis = activatedItemImeiMap.get(snap.getItemId());
|
2375 |
List<String> activatedImeis = activatedItemImeiMap.get(snap.getItemId());
|
| 2373 |
if (activatedImeis != null && !activatedImeis.isEmpty()) {
|
2376 |
if (activatedImeis != null && !activatedImeis.isEmpty()) {
|
| 2374 |
inStockItemDetailModel.setHasActivatedImei(true);
|
2377 |
inStockItemDetailModel.setHasActivatedImei(true);
|
| 2375 |
inStockItemDetailModel.setActivatedImeis(activatedImeis);
|
2378 |
inStockItemDetailModel.setActivatedImeis(activatedImeis);
|
| 2376 |
}
|
2379 |
}
|
| 2377 |
inStockItemDetailModels.add(inStockItemDetailModel);
|
2380 |
inStockItemDetailModels.add(inStockItemDetailModel);
|
| 2378 |
}
|
2381 |
}
|
| 2379 |
|
2382 |
|
| - |
|
2383 |
// Get GRN pending orders for this fofoId and filter by catalog items
|
| - |
|
2384 |
Map<Integer, Integer> grnPendingOrders = orderRepository.selectPendingGrnOrders(fofoId).stream()
|
| - |
|
2385 |
.filter(x -> itemSet.contains(x.getLineItem().getItemId()))
|
| - |
|
2386 |
.collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
|
| - |
|
2387 |
Collectors.summingInt(x -> x.getLineItem().getQuantity())));
|
| - |
|
2388 |
|
| - |
|
2389 |
// Add GRN pending items
|
| - |
|
2390 |
for (Map.Entry<Integer, Integer> entry : grnPendingOrders.entrySet()) {
|
| - |
|
2391 |
int itemId = entry.getKey();
|
| - |
|
2392 |
int qty = entry.getValue();
|
| - |
|
2393 |
if (itemMap.containsKey(itemId)) {
|
| - |
|
2394 |
InStockItemDetailModel grnModel = new InStockItemDetailModel();
|
| - |
|
2395 |
grnModel.setAvailability(qty);
|
| - |
|
2396 |
grnModel.setItemId(itemId);
|
| - |
|
2397 |
grnModel.setCatalogId(itemMap.get(itemId).getCatalogItemId());
|
| - |
|
2398 |
grnModel.setItemDescription(itemMap.get(itemId).getItemDescription());
|
| - |
|
2399 |
grnModel.setFofoId(fofoId);
|
| - |
|
2400 |
grnModel.setStockType("GRN_PENDING");
|
| - |
|
2401 |
inStockItemDetailModels.add(grnModel);
|
| - |
|
2402 |
}
|
| - |
|
2403 |
}
|
| - |
|
2404 |
|
| 2380 |
return responseSender.ok(inStockItemDetailModels);
|
2405 |
return responseSender.ok(inStockItemDetailModels);
|
| 2381 |
}
|
2406 |
}
|
| 2382 |
|
2407 |
|
| 2383 |
@RequestMapping(value = "/indent/getOurStockDetails", method = RequestMethod.GET)
|
2408 |
@RequestMapping(value = "/indent/getOurStockDetails", method = RequestMethod.GET)
|
| 2384 |
public ResponseEntity<?> getOurStockDetails(HttpServletRequest request, @RequestParam int catalogId, @RequestParam int warehouseId, Model model)
|
2409 |
public ResponseEntity<?> getOurStockDetails(HttpServletRequest request, @RequestParam int catalogId, @RequestParam int warehouseId, Model model)
|