| 
					
				 | 
			
			
				@@ -279,7 +279,7 @@ public class OffSiteTransportationController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         map.put("resultArrivalAddress",resultArrivalAddress); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         map.putAll(value); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Integer resTfulResult=0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Integer resTfulResult=-1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resTfulResult = offSiteTransportationService.addTmstruckReceiptResult(map); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }catch (Exception e){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -290,7 +290,7 @@ public class OffSiteTransportationController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return failed(e.getMessage()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (resTfulResult!=4){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (resTfulResult==0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             offSiteTransportationService.orderClose(orderNumber); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -349,12 +349,12 @@ public class OffSiteTransportationController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }else if(resTfulResult ==4 ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             System.out.println("没有抵达实绩"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed("请先抵达作业!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return failed("签收失败,请刷新重试"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return success("签收成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |