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