| Line 340... |
Line 340... |
| 340 |
}
|
340 |
}
|
| 341 |
|
341 |
|
| 342 |
@RequestMapping(value = "/customerDetails", method = RequestMethod.PUT)
|
342 |
@RequestMapping(value = "/customerDetails", method = RequestMethod.PUT)
|
| 343 |
public String updateCustomerDetails(HttpServletRequest request, @RequestBody CustomCustomer customCustomer,
|
343 |
public String updateCustomerDetails(HttpServletRequest request, @RequestBody CustomCustomer customCustomer,
|
| 344 |
@RequestParam(name = ProfitMandiConstants.INVOICE_NUMBER) String invoiceNumber, Model model)
|
344 |
@RequestParam(name = ProfitMandiConstants.INVOICE_NUMBER) String invoiceNumber, Model model)
|
| 345 |
throws ProfitMandiBusinessException {
|
345 |
throws Exception {
|
| 346 |
|
346 |
|
| 347 |
orderService.updateCustomerDetails(customCustomer, invoiceNumber);
|
347 |
orderService.updateCustomerDetails(customCustomer, invoiceNumber);
|
| 348 |
|
- |
|
| 349 |
return this.getSearchOrderDetails(request, invoiceNumber, model);
|
348 |
return this.getSearchOrderDetails(request, invoiceNumber, model);
|
| 350 |
}
|
349 |
}
|
| 351 |
|
350 |
|
| 352 |
@RequestMapping(value = "/searchOrderDetails", method = RequestMethod.GET)
|
351 |
@RequestMapping(value = "/searchOrderDetails", method = RequestMethod.GET)
|
| 353 |
public String getSearchOrderDetails(HttpServletRequest request,
|
352 |
public String getSearchOrderDetails(HttpServletRequest request,
|
| 354 |
@RequestParam(name = ProfitMandiConstants.INVOICE_NUMBER) String invoiceNumber, Model model)
|
353 |
@RequestParam(name = ProfitMandiConstants.INVOICE_NUMBER) String invoiceNumber, Model model)
|
| 355 |
throws ProfitMandiBusinessException {
|
354 |
throws Exception {
|
| 356 |
|
355 |
|
| 357 |
FofoOrder fofoOrder = fofoOrderRepository.selectByInvoiceNumber(invoiceNumber);
|
356 |
FofoOrder fofoOrder = fofoOrderRepository.selectByInvoiceNumber(invoiceNumber);
|
| 358 |
List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
|
357 |
List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
|
| 359 |
Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
|
358 |
Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
|
| 360 |
CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
|
359 |
CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
|
| Line 383... |
Line 382... |
| 383 |
this.addInsuranceProvider(insurancePolicies);
|
382 |
this.addInsuranceProvider(insurancePolicies);
|
| 384 |
model.addAttribute("fofoOrder", fofoOrder);
|
383 |
model.addAttribute("fofoOrder", fofoOrder);
|
| 385 |
for(FofoOrderItem fofoOrderItem : fofoOrderItems) {
|
384 |
for(FofoOrderItem fofoOrderItem : fofoOrderItems) {
|
| 386 |
fofoOrderItem.setDoa(true);
|
385 |
fofoOrderItem.setDoa(true);
|
| 387 |
}
|
386 |
}
|
| - |
|
387 |
|
| - |
|
388 |
Map<Integer, Set<FofoLineItem>> fofoOrderItemIdLineItemMap = fofoOrderItems.stream()
|
| - |
|
389 |
.collect(Collectors.toMap(FofoOrderItem::getId, FofoOrderItem::getFofoLineItems));
|
| - |
|
390 |
|
| - |
|
391 |
Map<Integer, List<CustomerReturnItem>> foiIdCustomerReturnInventoryItemsMap = fofoOrderItems.stream()
|
| - |
|
392 |
.collect(Collectors.toMap(foi -> foi.getId(),
|
| - |
|
393 |
foi -> customerReturnItemRepository.selectAllByOrderItemId(foi.getId())));
|
| - |
|
394 |
|
| - |
|
395 |
Map<Integer, Integer> inventoryItemBilledQtyMap = new HashMap<>();
|
| - |
|
396 |
|
| - |
|
397 |
for (FofoOrderItem foi : fofoOrderItems) {
|
| - |
|
398 |
for (FofoLineItem fli : foi.getFofoLineItems()) {
|
| - |
|
399 |
inventoryItemBilledQtyMap.put(fli.getInventoryItemId(), fli.getQuantity());
|
| - |
|
400 |
}
|
| - |
|
401 |
List<CustomerReturnItem> customerReturnItems = customerReturnItemRepository
|
| - |
|
402 |
.selectAllByOrderItemId(foi.getId());
|
| - |
|
403 |
this.markDoa(fofoOrder, foi);
|
| - |
|
404 |
for (CustomerReturnItem customerReturnItem : customerReturnItems) {
|
| - |
|
405 |
inventoryItemBilledQtyMap.put(customerReturnItem.getInventoryItemId(),
|
| - |
|
406 |
inventoryItemBilledQtyMap.get(customerReturnItem.getInventoryItemId()) - 1);
|
| - |
|
407 |
}
|
| - |
|
408 |
}
|
| - |
|
409 |
model.addAttribute("foiIdCustomerReturnInventoryItemsMap",
|
| - |
|
410 |
StringUtils.toString(foiIdCustomerReturnInventoryItemsMap));
|
| 388 |
model.addAttribute("fofoOrderItems", fofoOrderItems);
|
411 |
model.addAttribute("fofoOrderItems", fofoOrderItems);
|
| - |
|
412 |
model.addAttribute("inventoryItemBilledQtyMap", StringUtils.toString(inventoryItemBilledQtyMap));
|
| - |
|
413 |
model.addAttribute("fofoOrderItemIdLineItemsMap", StringUtils.toString(fofoOrderItemIdLineItemMap));
|
| 389 |
model.addAttribute("itemsMap", itemsMap);
|
414 |
model.addAttribute("itemsMap", itemsMap);
|
| 390 |
model.addAttribute("markDefective", true);
|
415 |
model.addAttribute("markDefective", true);
|
| 391 |
model.addAttribute("customer", customer);
|
416 |
model.addAttribute("customer", customer);
|
| 392 |
model.addAttribute("customerAddress", customerAddress);
|
417 |
model.addAttribute("customerAddress", customerAddress);
|
| 393 |
model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
|
418 |
model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
|