|  | @@ -2239,20 +2239,28 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 | 
	
		
			
				|  |  |          List<TWarehouseBills> warehouseBills = tWarehouseBillsMapper.webVersionOrderList(tWarehouseBills);
 | 
	
		
			
				|  |  |          if (CollectionUtils.isNotEmpty(warehouseBills)) {
 | 
	
		
			
				|  |  |              for (TWarehouseBills warehouseBill : warehouseBills) {
 | 
	
		
			
				|  |  | +                //货物信息
 | 
	
		
			
				|  |  |                  TWarehousebillsCntr warehousebillsCntr = new TWarehousebillsCntr();
 | 
	
		
			
				|  |  |                  warehousebillsCntr.setfPid(warehouseBill.getfId());
 | 
	
		
			
				|  |  |                  List<TWarehousebillsCntr> tWarehousebillsCntrs = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(warehousebillsCntr);
 | 
	
		
			
				|  |  |                  if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
 | 
	
		
			
				|  |  |                      warehouseBill.settWarehousebillsCntrList(tWarehousebillsCntrs);
 | 
	
		
			
				|  |  |                  }
 | 
	
		
			
				|  |  | +                //箱信息
 | 
	
		
			
				|  |  |                  TWarehousebillsCntritems warehousebillsCntritems = new TWarehousebillsCntritems();
 | 
	
		
			
				|  |  |                  warehousebillsCntritems.setfPid(warehouseBill.getfId());
 | 
	
		
			
				|  |  |                  List<TWarehousebillsCntritems> tWarehousebillsCntritems = tWarehousebillsCntritemsMapper.selectTWarehousebillsCntritemsList(warehousebillsCntritems);
 | 
	
		
			
				|  |  |                  if (CollectionUtils.isNotEmpty(tWarehousebillsCntritems)) {
 | 
	
		
			
				|  |  |                      warehouseBill.settWarehousebillsCntritemsList(tWarehousebillsCntritems);
 | 
	
		
			
				|  |  |                  }
 | 
	
		
			
				|  |  | +                //航线信息
 | 
	
		
			
				|  |  |                  TVoyage tVoyage = tVoyageMapper.selectTVoyageById(warehouseBill.getfVoyid());
 | 
	
		
			
				|  |  |                  warehouseBill.settVoyageL(tVoyage);
 | 
	
		
			
				|  |  | +                //应收信息
 | 
	
		
			
				|  |  | +                List<TWarehousebillsfees> tWarehousebillsfeesDr = tWarehousebillsfeesMapper.selectFeesByPId(warehouseBill.getfId(), "D");
 | 
	
		
			
				|  |  | +                if (CollectionUtils.isNotEmpty(tWarehousebillsfeesDr)){
 | 
	
		
			
				|  |  | +                    warehouseBill.settWarehousebillsfeesDr(tWarehousebillsfeesDr);
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return warehouseBills;
 |