WebSVN – SmartDukaan – Diff – /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java

 					orderDetailsMap.put(order.getLogisticsTransactionId(), order);
+				}
+			}
 			for(Order order: selectedOrders){
+				if(order.getLogisticsTransactionId()!=null){
-				if(totalWeightMap.containsKey(order.getLogisticsTransactionId())){
+					if(totalWeightMap.containsKey(order.getLogisticsTransactionId())){
-					double totalWeight = totalWeightMap.get(order.getLogisticsTransactionId())+ order.getTotal_weight();
+						double totalWeight = totalWeightMap.get(order.getLogisticsTransactionId())+ order.getTotal_weight();
+						totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
+					}else{
+						double totalWeight = order.getTotal_weight();
-					totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
+						totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
+					}
+					if(airwayBillNoMap.containsKey(order.getLogisticsTransactionId())){
+						continue;
+					}else{
+						airwayBillNoMap.put(order.getLogisticsTransactionId(), order.getAirwaybill_no());
+					}
 				}else{
-					double totalWeight = order.getTotal_weight();
-					totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
-				}
-				if(airwayBillNoMap.containsKey(order.getLogisticsTransactionId())){
-					continue;
-				}else{
-					airwayBillNoMap.put(order.getLogisticsTransactionId(), order.getAirwaybill_no());
+					airwayBillNoMap.put(order.getId()+"", order.getAirwaybill_no());
+				}
+			}
 			int serialNo = 0;

Subversion Repositories SmartDukaan