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();

 
	}
 
	@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();

 
	}
 
	@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",

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

Subversion Repositories SmartDukaan

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

Rev 31107		Rev 31108
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 383...		Line 383...
383		383
384	`}`	384	`}`
385		385
386	`@RequestMapping(value = "/createProvider", method = RequestMethod.POST)`	386	`@RequestMapping(value = "/createProvider", method = RequestMethod.POST)`
387	`public String createProvider(HttpServletRequest request, @RequestBody ProviderDetailModel providerDetailModel,`	387	`public String createProvider(HttpServletRequest request, @RequestBody ProviderDetailModel providerDetailModel,`
388	`Model model) throws Exception {`	388	`Model model) throws Exception {`
389		389
390	`Provider provider = new Provider();`	390	`Provider provider = new Provider();`
391	`provider.setName(providerDetailModel.getName());`	391	`provider.setName(providerDetailModel.getName());`
392	`provider.setActive(providerDetailModel.isProvideractive());`	392	`provider.setActive(providerDetailModel.isProvideractive());`
393	`provider.setBundleWeightLimit(0);`	393	`provider.setBundleWeightLimit(0);`
Line 442...		Line 442...
442		442
443	`}`	443	`}`
444		444
445	`@RequestMapping(value = "/providerTatFileUploader", method = RequestMethod.POST)`	445	`@RequestMapping(value = "/providerTatFileUploader", method = RequestMethod.POST)`
446	`public String providerTatFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`	446	`public String providerTatFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`
447	`@RequestPart MultipartFile file) throws Throwable {`	447	`@RequestPart MultipartFile file) throws Throwable {`
448		448
449	`LOGGER.info("file" + file.toString());`	449	`LOGGER.info("file" + file.toString());`
450	`String fileName = file.getName();`	450	`String fileName = file.getName();`
451		451
452	`String fileNames = file.getOriginalFilename();`	452	`String fileNames = file.getOriginalFilename();`
Line 518...		Line 518...
518		518
519	`}`	519	`}`
520		520
521	`@RequestMapping(value = "/createPublicHoliday", method = RequestMethod.POST)`	521	`@RequestMapping(value = "/createPublicHoliday", method = RequestMethod.POST)`
522	`public String createPublicHoliday(HttpServletRequest request, @RequestParam LocalDate date,`	522	`public String createPublicHoliday(HttpServletRequest request, @RequestParam LocalDate date,`
523	`@RequestParam String occassion, Model model) throws Exception {`	523	`@RequestParam String occassion, Model model) throws Exception {`
524		524
525	`PublicHolidays ph = new PublicHolidays();`	525	`PublicHolidays ph = new PublicHolidays();`
526	`ph.setDate(date);`	526	`ph.setDate(date);`
527	`ph.setHolidayDate(LocalDate.now().atStartOfDay());`	527	`ph.setHolidayDate(LocalDate.now().atStartOfDay());`
528	`ph.setOccasion(occassion);`	528	`ph.setOccasion(occassion);`
Line 617...		Line 617...
617		617
618	`}`	618	`}`
619		619
620	`@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)`	620	`@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)`
621	`public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`	621	`public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`
622	`@RequestPart MultipartFile file) throws Throwable {`	622	`@RequestPart MultipartFile file) throws Throwable {`
623		623
624	`List<CSVRecord> records = FileUtil.readFile(file);`	624	`List<CSVRecord> records = FileUtil.readFile(file);`
625		625
626	`List<DelayDayModel> delayDayList = new ArrayList<>();`	626	`List<DelayDayModel> delayDayList = new ArrayList<>();`
627	`for (CSVRecord record : records) {`	627	`for (CSVRecord record : records) {`
Line 735...		Line 735...
735		735
736	`}`	736	`}`
737		737
738	`@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)`	738	`@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)`
739	`public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`	739	`public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response,`
740	`@RequestPart MultipartFile file) throws Throwable {`	740	`@RequestPart MultipartFile file) throws Throwable {`
741		741
742	`List<CSVRecord> records = FileUtil.readFile(file);`	742	`List<CSVRecord> records = FileUtil.readFile(file);`
743		743
744	`List<MarkDeliveredModel> deliveredList = new ArrayList<>();`	744	`List<MarkDeliveredModel> deliveredList = new ArrayList<>();`
745	`for (CSVRecord record : records) {`	745	`for (CSVRecord record : records) {`
Line 751...		Line 751...
751	`if (!deliveredList.isEmpty()) {`	751	`if (!deliveredList.isEmpty()) {`
752		752
753	`List<Order> vorders = orderRepository.selectByAirwayBillNumber(`	753	`List<Order> vorders = orderRepository.selectByAirwayBillNumber(`
754	`deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));`	754	`deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));`
755		755
756	`List<Order> filteredorders = vorders.stream().filter(x -> (!x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)`	756	`List<Order> filteredorders = vorders.stream().filter(x -> (`
-		757	`x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)`
757	`&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS))).collect(Collectors.toList());`	758	`&& !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS)`
-		759	`)).collect(Collectors.toList());`
758		760
759	`LOGGER.info("filteredOrder" + filteredorders);`	761	`LOGGER.info("filteredOrder" + filteredorders);`
760		762
761	`if (!filteredorders.isEmpty()) {`	763	`if (!filteredorders.isEmpty()) {`
762	`throw new ProfitMandiBusinessException("Upload File",`	764	`throw new ProfitMandiBusinessException("Upload File",`
Line 852...		Line 854...
852		854
853	`}`	855	`}`
854		856
855	`@RequestMapping(value = "/getDelayBillingFileUploader", method = RequestMethod.POST)`	857	`@RequestMapping(value = "/getDelayBillingFileUploader", method = RequestMethod.POST)`
856	`public String getDelayBillingFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`	858	`public String getDelayBillingFileUploader(HttpServletRequest request, Model model, HttpServletResponse response,`
857	`@RequestPart MultipartFile file) throws Throwable {`	859	`@RequestPart MultipartFile file) throws Throwable {`
858		860
859	`LOGGER.info("file" + file.toString());`	861	`LOGGER.info("file" + file.toString());`
860	`String fileName = file.getName();`	862	`String fileName = file.getName();`
861		863
862	`String fileNames = file.getOriginalFilename();`	864	`String fileNames = file.getOriginalFilename();`