Subversion Repositories SmartDukaan

Rev

Rev 22139 | Rev 22354 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 22139 Rev 22244
Line 527... Line 527...
527 
				}else{
 527 
				}else{
528 
					grnHistoryDetail.put(ProfitMandiConstants.SERIALIZED, true);
 528 
					grnHistoryDetail.put(ProfitMandiConstants.SERIALIZED, true);
529 
					Set<String> serialNumbers = new HashSet<>();
 529 
					Set<String> serialNumbers = new HashSet<>();
530 
					serialNumbers.add(inventoryItem.getSerialNumber());
 530 
					serialNumbers.add(inventoryItem.getSerialNumber());
531 
					grnHistoryDetail.put(ProfitMandiConstants.SERIAL_NUMBERS, serialNumbers);
 531 
					grnHistoryDetail.put(ProfitMandiConstants.SERIAL_NUMBERS, serialNumbers);
- 
 
 532 
					grnHistoryDetail.put("formattedSerialNumbers", String.join(", ", serialNumbers));
532 
				}
 533 
				}
533 
				grnHistoryDetails.put(inventoryItem.getItemId(), grnHistoryDetail);
 534 
				grnHistoryDetails.put(inventoryItem.getItemId(), grnHistoryDetail);
534 
				//itemIds.add(inventoryItem.getItemId());
 535 
				//itemIds.add(inventoryItem.getItemId());
535 
			}else{
 536 
			}else{
536 
				Map<String, Object> grnHistoryDetail = grnHistoryDetails.get(inventoryItem.getItemId());
 537 
				Map<String, Object> grnHistoryDetail = grnHistoryDetails.get(inventoryItem.getItemId());
537 
				if((boolean)grnHistoryDetail.get(ProfitMandiConstants.SERIALIZED)){
 538 
				if((boolean)grnHistoryDetail.get(ProfitMandiConstants.SERIALIZED)){
538 
					@SuppressWarnings("unchecked")
 539 
					@SuppressWarnings("unchecked")
539 
					Set<String> serialNumbers = (Set<String>)grnHistoryDetail.get(ProfitMandiConstants.SERIAL_NUMBERS);
 540 
					Set<String> serialNumbers = (Set<String>)grnHistoryDetail.get(ProfitMandiConstants.SERIAL_NUMBERS);
540 
					LOGGER.info("serialNumbers {}", serialNumbers);
 541 
					LOGGER.info("serialNumbers {}", serialNumbers);
541 
					serialNumbers.add(inventoryItem.getSerialNumber());
 542 
					serialNumbers.add(inventoryItem.getSerialNumber());
- 
 
 543 
					grnHistoryDetail.put("formattedSerialNumbers", String.join(", ", serialNumbers));
542 
					grnHistoryDetail.put(ProfitMandiConstants.QUANTITY, (int)grnHistoryDetail.get(ProfitMandiConstants.QUANTITY) + inventoryItem.getInitialQuantity());
 544 
					grnHistoryDetail.put(ProfitMandiConstants.QUANTITY, (int)grnHistoryDetail.get(ProfitMandiConstants.QUANTITY) + inventoryItem.getInitialQuantity());
543 
				}
 545 
				}
544 
			}
 546 
			}
545 
 
 547 
 
546 
		}
 548 
		}
Line 549... Line 551...
549 
 
 551 
 
550 
	public List<Item> getItemsByItemIds(Set<Integer> itemIds){
 552 
	public List<Item> getItemsByItemIds(Set<Integer> itemIds){
551 
		return null;
 553 
		return null;
552 
	}
 554 
	}
553 
 
 555 
 
554 
	/*@RequestMapping(value = "/grnHist")
 - 
 
555 
	public String grnHist(HttpServletRequest request) throws Exception{
 - 
 
556 
		LOGGER.info("result {}", orderRepository.selectByInvoiceNumber("58400149931", 963490));
 - 
 
557 
		return null;
 - 
 
558 
	}*/
 - 
 
559 
 
 - 
 
560 
	@RequestMapping(value = "/grnHist")
 - 
 
561 
	public String grnHist(HttpServletRequest request ) throws Exception{
 - 
 
562 
		Purchase purchase = null;
 - 
 
563 
		try {
 - 
 
564 
			purchase = purchaseRepository.selectById(2);
 - 
 
565 
		} catch (ProfitMandiBusinessException e) {
 - 
 
566 
			// TODO Auto-generated catch block
 - 
 
567 
			e.printStackTrace();
 - 
 
568 
		}
 - 
 
569 
		LOGGER.info("grnHistoryDetails {}", StringUtils.toString(this.grnHistoryDetails(purchase, 963490)));
 - 
 
570 
		return null;
 - 
 
571 
	}
 - 
 
572 
 
 - 
 
573 
}
 556 
}