| 
					
				 | 
			
			
				@@ -8911,10 +8911,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 1.查询原订单信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 2.判断原订单是否卸船 否不能转船 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(aLong); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (warehouseBills.getfArrivalStatus().longValue() != 2L) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            /*if (warehouseBills.getfArrivalStatus().longValue() != 2L) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 throw new RuntimeException("提单号" + warehouseBills.getfMblno() + "的订单状态未到港卸货不能转船"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 3.复制原订单数据生成新的订单 系统编号重新生成 新订单提单号为转配船+原提单号 船名航次为选择转船的船名航次 配船状态回复默认值 未配船 离港出运状态回复默认值 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             TWarehouseBills bills = new TWarehouseBills(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BeanUtils.copyProperties(warehouseBills, bills); 
			 |