Subversion Repositories SmartDukaan

Rev

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

Rev 13276 Rev 13446
Line 173... Line 173...
173
					orderDetailsMap.put(order.getLogisticsTransactionId(), order);
173
					orderDetailsMap.put(order.getLogisticsTransactionId(), order);
174
				}
174
				}
175
			}
175
			}
176
			
176
			
177
			for(Order order: selectedOrders){
177
			for(Order order: selectedOrders){
-
 
178
				if(order.getLogisticsTransactionId()!=null){
178
				if(totalWeightMap.containsKey(order.getLogisticsTransactionId())){
179
					if(totalWeightMap.containsKey(order.getLogisticsTransactionId())){
179
					double totalWeight = totalWeightMap.get(order.getLogisticsTransactionId())+ order.getTotal_weight();
180
						double totalWeight = totalWeightMap.get(order.getLogisticsTransactionId())+ order.getTotal_weight();
-
 
181
						totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
-
 
182
					}else{
-
 
183
						double totalWeight = order.getTotal_weight();
180
					totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
184
						totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
-
 
185
					}
-
 
186
					if(airwayBillNoMap.containsKey(order.getLogisticsTransactionId())){
-
 
187
						continue;
-
 
188
					}else{
-
 
189
						airwayBillNoMap.put(order.getLogisticsTransactionId(), order.getAirwaybill_no());
-
 
190
					}
181
				}else{
191
				}else{
182
					double totalWeight = order.getTotal_weight();
-
 
183
					totalWeightMap.put(order.getLogisticsTransactionId(), totalWeight);
-
 
184
				}
-
 
185
				if(airwayBillNoMap.containsKey(order.getLogisticsTransactionId())){
-
 
186
					continue;
-
 
187
				}else{
-
 
188
					airwayBillNoMap.put(order.getLogisticsTransactionId(), order.getAirwaybill_no());
192
					airwayBillNoMap.put(order.getId()+"", order.getAirwaybill_no());
189
				}
193
				}
190
			}
194
			}
191
			
195
			
192
			int serialNo = 0;
196
			int serialNo = 0;
193
			
197