WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java



		return "response";
	}
 
	@RequestMapping(value = "/billedOrderFileUploader", method = RequestMethod.POST)
	public String getBilledOrderFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,
			@RequestPart MultipartFile file) throws Throwable {
 
		LOGGER.info("file" + file.toString());
		String fileName = file.getName();
 
		String fileNames = file.getOriginalFilename();

 
		}
 
		LOGGER.info("fofoIds" + fofoIds);
 
		LOGGER.info("warehouseIds" + warehouseIds);
 
		Map<String, DispatchNotificationModel> dispatchNotication = new HashMap<>();
 
		if (!billedOrderList.isEmpty()) {
			List<Order> ords = orderRepository.selectByInvoiceNumbers(
					billedOrderList.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toList()));

 
	}
 
	@RequestMapping(value = "/createProvider", method = RequestMethod.POST)
	public String createProvider(HttpServletRequest request, @RequestBody ProviderDetailModel providerDetailModel,
			Model model) throws Exception {
 
		Provider provider = new Provider();
		provider.setName(providerDetailModel.getName());
		provider.setActive(providerDetailModel.isProvideractive());
		provider.setBundleWeightLimit(0);

 
	}
 
	@RequestMapping(value = "/providerTatFileUploader", method = RequestMethod.POST)
	public String providerTatFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,
			@RequestPart MultipartFile file) throws Throwable {
 
		LOGGER.info("file" + file.toString());
		String fileName = file.getName();
 
		String fileNames = file.getOriginalFilename();

		}
		if (!providerTatList.isEmpty()) {
 
			for (ProviderTatModel pt : providerTatList) {
 
 
				Provider provider = providerRepository.selectByName(pt.getProviderName());
 
				if (provider == null) {
					throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");
				}

 
	}
 
	@RequestMapping(value = "/createPublicHoliday", method = RequestMethod.POST)
	public String createPublicHoliday(HttpServletRequest request, @RequestParam LocalDate date,
			@RequestParam String occassion, Model model) throws Exception {
 
		PublicHolidays ph = new PublicHolidays();
		ph.setDate(date);
		ph.setHolidayDate(LocalDate.now().atStartOfDay());
		ph.setOccasion(occassion);

 
	}
 
	@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)
	public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,
			@RequestPart MultipartFile file) throws Throwable {
 
		List<CSVRecord> records = FileUtil.readFile(file);
 
		List<DelayDayModel> delayDayList = new ArrayList<>();
		for (CSVRecord record : records) {

 
	}
 
	@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)
	public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,
			@RequestPart MultipartFile file) throws Throwable {
 
		List<CSVRecord> records = FileUtil.readFile(file);
 
		List<MarkDeliveredModel> deliveredList = new ArrayList<>();
		for (CSVRecord record : records) {

		if (!deliveredList.isEmpty()) {
 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
 
			List<Order> filteredorders = vorders.stream().filter(x -> (x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)
 
					&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());
 
 
			LOGGER.info("filteredOrder" + filteredorders);
 
			if (!filteredorders.isEmpty()) {
				throw new ProfitMandiBusinessException("Upload File",

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java – Rev 31238 → 31329

Rev 31238		Rev 31329
Line 160...		Line 160...
160	`return "response";`	160	`return "response";`
161	`}`	161	`}`
162		162
163	`@RequestMapping(value = "/billedOrderFileUploader", method = RequestMethod.POST)`	163	`@RequestMapping(value = "/billedOrderFileUploader", method = RequestMethod.POST)`
164	`public String getBilledOrderFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`	164	`public String getBilledOrderFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`
165	`@RequestPart MultipartFile file) throws Throwable {`	165	`@RequestPart MultipartFile file) throws Throwable {`
166		166
167	`LOGGER.info("file" + file.toString());`	167	`LOGGER.info("file" + file.toString());`
168	`String fileName = file.getName();`	168	`String fileName = file.getName();`
169		169
170	`String fileNames = file.getOriginalFilename();`	170	`String fileNames = file.getOriginalFilename();`
Line 207...		Line 207...
207		207
208	`}`	208	`}`
209		209
210	`LOGGER.info("fofoIds" + fofoIds);`	210	`LOGGER.info("fofoIds" + fofoIds);`
211		211
-		212	`LOGGER.info("warehouseIds" + warehouseIds);`
-		213
212	`Map<String, DispatchNotificationModel> dispatchNotication = new HashMap<>();`	214	`Map<String, DispatchNotificationModel> dispatchNotication = new HashMap<>();`
213		215
214	`if (!billedOrderList.isEmpty()) {`	216	`if (!billedOrderList.isEmpty()) {`
215	`List<Order> ords = orderRepository.selectByInvoiceNumbers(`	217	`List<Order> ords = orderRepository.selectByInvoiceNumbers(`
216	`billedOrderList.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toList()));`	218	`billedOrderList.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toList()));`
Line 383...		Line 385...
383		385
384	`}`	386	`}`
385		387
386	`@RequestMapping(value = "/createProvider", method = RequestMethod.POST)`	388	`@RequestMapping(value = "/createProvider", method = RequestMethod.POST)`
387	`public String createProvider(HttpServletRequest request, @RequestBody ProviderDetailModel providerDetailModel,`	389	`public String createProvider(HttpServletRequest request, @RequestBody ProviderDetailModel providerDetailModel,`
388	`Model model) throws Exception {`	390	`Model model) throws Exception {`
389		391
390	`Provider provider = new Provider();`	392	`Provider provider = new Provider();`
391	`provider.setName(providerDetailModel.getName());`	393	`provider.setName(providerDetailModel.getName());`
392	`provider.setActive(providerDetailModel.isProvideractive());`	394	`provider.setActive(providerDetailModel.isProvideractive());`
393	`provider.setBundleWeightLimit(0);`	395	`provider.setBundleWeightLimit(0);`
Line 442...		Line 444...
442		444
443	`}`	445	`}`
444		446
445	`@RequestMapping(value = "/providerTatFileUploader", method = RequestMethod.POST)`	447	`@RequestMapping(value = "/providerTatFileUploader", method = RequestMethod.POST)`
446	`public String providerTatFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`	448	`public String providerTatFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`
447	`@RequestPart MultipartFile file) throws Throwable {`	449	`@RequestPart MultipartFile file) throws Throwable {`
448		450
449	`LOGGER.info("file" + file.toString());`	451	`LOGGER.info("file" + file.toString());`
450	`String fileName = file.getName();`	452	`String fileName = file.getName();`
451		453
452	`String fileNames = file.getOriginalFilename();`	454	`String fileNames = file.getOriginalFilename();`
Line 463...		Line 465...
463	`}`	465	`}`
464	`if (!providerTatList.isEmpty()) {`	466	`if (!providerTatList.isEmpty()) {`
465		467
466	`for (ProviderTatModel pt : providerTatList) {`	468	`for (ProviderTatModel pt : providerTatList) {`
467		469
468		-
469	`Provider provider = providerRepository.selectByName(pt.getProviderName());`	470	`Provider provider = providerRepository.selectByName(pt.getProviderName());`
470		471
471	`if (provider == null) {`	472	`if (provider == null) {`
472	`throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");`	473	`throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");`
473	`}`	474	`}`
Line 518...		Line 519...
518		519
519	`}`	520	`}`
520		521
521	`@RequestMapping(value = "/createPublicHoliday", method = RequestMethod.POST)`	522	`@RequestMapping(value = "/createPublicHoliday", method = RequestMethod.POST)`
522	`public String createPublicHoliday(HttpServletRequest request, @RequestParam LocalDate date,`	523	`public String createPublicHoliday(HttpServletRequest request, @RequestParam LocalDate date,`
523	`@RequestParam String occassion, Model model) throws Exception {`	524	`@RequestParam String occassion, Model model) throws Exception {`
524		525
525	`PublicHolidays ph = new PublicHolidays();`	526	`PublicHolidays ph = new PublicHolidays();`
526	`ph.setDate(date);`	527	`ph.setDate(date);`
527	`ph.setHolidayDate(LocalDate.now().atStartOfDay());`	528	`ph.setHolidayDate(LocalDate.now().atStartOfDay());`
528	`ph.setOccasion(occassion);`	529	`ph.setOccasion(occassion);`
Line 617...		Line 618...
617		618
618	`}`	619	`}`
619		620
620	`@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)`	621	`@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)`
621	`public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`	622	`public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`
622	`@RequestPart MultipartFile file) throws Throwable {`	623	`@RequestPart MultipartFile file) throws Throwable {`
623		624
624	`List<CSVRecord> records = FileUtil.readFile(file);`	625	`List<CSVRecord> records = FileUtil.readFile(file);`
625		626
626	`List<DelayDayModel> delayDayList = new ArrayList<>();`	627	`List<DelayDayModel> delayDayList = new ArrayList<>();`
627	`for (CSVRecord record : records) {`	628	`for (CSVRecord record : records) {`
Line 735...		Line 736...
735		736
736	`}`	737	`}`
737		738
738	`@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)`	739	`@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)`
739	`public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`	740	`public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`
740	`@RequestPart MultipartFile file) throws Throwable {`	741	`@RequestPart MultipartFile file) throws Throwable {`
741		742
742	`List<CSVRecord> records = FileUtil.readFile(file);`	743	`List<CSVRecord> records = FileUtil.readFile(file);`
743		744
744	`List<MarkDeliveredModel> deliveredList = new ArrayList<>();`	745	`List<MarkDeliveredModel> deliveredList = new ArrayList<>();`
745	`for (CSVRecord record : records) {`	746	`for (CSVRecord record : records) {`
Line 751...		Line 752...
751	`if (!deliveredList.isEmpty()) {`	752	`if (!deliveredList.isEmpty()) {`
752		753
753	`List<Order> vorders = orderRepository.selectByAirwayBillNumber(`	754	`List<Order> vorders = orderRepository.selectByAirwayBillNumber(`
754	`deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));`	755	`deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));`
755		756
756	`List<Order> filteredorders = vorders.stream().filter(x -> (`	757	`List<Order> filteredorders = vorders.stream().filter(x -> (x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)`
757	`x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)`	-
758	`&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS)`	758	`&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());`
759	`)).collect(Collectors.toList());`	-
760		759
761	`LOGGER.info("filteredOrder" + filteredorders);`	760	`LOGGER.info("filteredOrder" + filteredorders);`
762		761
763	`if (!filteredorders.isEmpty()) {`	762	`if (!filteredorders.isEmpty()) {`
764	`throw new ProfitMandiBusinessException("Upload File",`	763	`throw new ProfitMandiBusinessException("Upload File",`