Subversion Repositories SmartDukaan

Rev

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

Rev 32777 Rev 32784
Line 274... Line 274...
274
 
274
 
275
                List<BilledOrderListModel> blueDartOrders = blueDartService.getAirwayBillNo(blueDartAirbillBilledOrderMap, authUser.getEmailId());
275
                List<BilledOrderListModel> blueDartOrders = blueDartService.getAirwayBillNo(blueDartAirbillBilledOrderMap, authUser.getEmailId());
276
 
276
 
277
                orderList.addAll(blueDartOrders);
277
                orderList.addAll(blueDartOrders);
278
            }
278
            }
279
 
-
 
-
 
279
            Map<String, BilledOrderListModel> uniqueCombinations = new HashMap<>();
280
            for (BilledOrderListModel bl : orderList) {
280
            for (BilledOrderListModel bl : orderList) {
-
 
281
                String providerName = bl.getLogisticsProviderName();
-
 
282
                String airwayBillNumber = bl.getAirwayBillNumber();
-
 
283
                LocalDateTime shippingDate = bl.getShippingDate();
-
 
284
                // Check if the provider name is already encountered
-
 
285
                if (!uniqueCombinations.containsKey(providerName)) {
-
 
286
                    uniqueCombinations.put(providerName, bl);
-
 
287
                } else {
-
 
288
                    // If the provider name is the same, check if shipping date and AirwayBill number are different
-
 
289
                    BilledOrderListModel existingBl = uniqueCombinations.get(providerName);
-
 
290
                    if (existingBl.getShippingDate().equals(shippingDate) && existingBl.getAirwayBillNumber().equals(airwayBillNumber)) {
-
 
291
                        throw new ProfitMandiBusinessException("Validation Error", "", "Duplicate entry with the same Provider Name, Shipping Date, and AirwayBill Number");
-
 
292
                    }
-
 
293
                }
-
 
294
 
-
 
295
 
281
                List<Order> orders = orderRepository.selectByInvoiceNumber(bl.getInvoiceNumber());
296
                List<Order> orders = orderRepository.selectByInvoiceNumber(bl.getInvoiceNumber());
282
 
297
 
283
                Provider provider = providerRepository.selectByName(bl.getLogisticsProviderName());
298
                Provider provider = providerRepository.selectByName(bl.getLogisticsProviderName());
284
 
299
 
285
                if (provider == null) {
300
                if (provider == null) {