Subversion Repositories SmartDukaan

Rev

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

Rev 30039 Rev 30040
Line 1912... Line 1912...
1912 
	}
 1912 
	}
1913 
 
 1913 
 
1914 
	@Autowired
 1914 
	@Autowired
1915 
	private ObjectMapper objectMapper;
 1915 
	private ObjectMapper objectMapper;
1916 
 
 1916 
 
1917 
	@Autowired
 - 
 
1918 
	private ScanRecordRepository scanRecordRepository;
 - 
 
1919 
 
 - 
 
1920 
	@RequestMapping(value = "/imei/validate", method = RequestMethod.GET)
 1917 
	@RequestMapping(value = "/imei/validate", method = RequestMethod.GET)
1921 
	public String validateImei(HttpServletRequest request, @RequestParam String imei,
 1918 
	public String validateImei(HttpServletRequest request, @RequestParam String imei, Model model) throws Exception {
1922 
			@RequestParam String invoiceNumber, Model model) throws Exception {
 - 
 
1923 
		boolean isImei = false;
 1919 
		boolean isImei = false;
1924 
		FofoOrder fo = fofoOrderRepository.selectByInvoiceNumber(invoiceNumber);
 - 
 
1925 
 
 1920 
		{
1926 
		List<ScanRecord> scanRecords = scanRecordRepository.selectAllByOrderId(fo.getId());
 - 
 
1927 
 
 1921 
 
1928 
		for (ScanRecord sr : scanRecords) {
 - 
 
1929 
 
 - 
 
1930 
			InventoryItem inventoryItem = inventoryItemRepository.selectById(sr.getInventoryItemId());
 1922 
			InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumber(imei);
1931 
 
 1923 
 
1932 
			if (inventoryItem != null) {
 1924 
			if (inventoryItem != null) {
1933 
 
 1925 
 
1934 
				if (inventoryItem.getSerialNumber().equals(imei)) {
 1926 
				if (inventoryItem.getSerialNumber().equals(imei)) {
1935 
 
 1927 
 
Line 1938... Line 1930...
1938 
				}
 1930 
				}
1939 
			}
 1931 
			}
1940 
 
 1932 
 
1941 
		}
 1933 
		}
1942 
 
 1934 
 
1943 
		LOGGER.info("scanRecord" + scanRecords);
 - 
 
1944 
 
 - 
 
1945 
		model.addAttribute("response", objectMapper.writeValueAsString(isImei));
 1935 
		model.addAttribute("response", objectMapper.writeValueAsString(isImei));
1946 
		return "response";
 1936 
		return "response";
1947 
	}
 1937 
	}
1948 
 
 1938 
 
1949 
}
 1939 
}