|  |  | @ -272,12 +272,12 @@ public class IoOrderReviewController extends BaseController { | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { |  |  |  |         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             return ResultVOUtils.error(500, "单据已验收!"); |  |  |  |             return ResultVOUtils.error(500, "单据已验收!"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (updateExportStatusRequest.isEntrust() && updateExportStatusRequest.getEntrustId() != null) { |  |  |  |         if (updateExportStatusRequest.isEntrust()) { | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId()); |  |  |  | //            EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId());
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             if (entrustReceEntity == null) { |  |  |  | //            if (entrustReceEntity == null) {
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                 return ResultVOUtils.error(500, "无验收权限!"); |  |  |  | //                return ResultVOUtils.error(500, "无验收权限!");
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             } else { |  |  |  | //            } else {
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |             EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId()); | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |             if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { |  |  |  |             if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) { |  |  |  |                 if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     transferOrder(orderEntity, entrustReceEntity); |  |  |  |                     transferOrder(orderEntity, entrustReceEntity); | 
			
		
	
	
		
		
			
				
					|  |  | @ -294,7 +294,7 @@ public class IoOrderReviewController extends BaseController { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + ""); |  |  |  |                 updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + ""); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 return updateReview(authAdmin, orderEntity); |  |  |  |                 return updateReview(authAdmin, orderEntity); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  | //            }
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         } else { |  |  |  |         } else { | 
			
		
	
		
		
			
				
					
					|  |  |  |             ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest(); |  |  |  |             ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest(); | 
			
		
	
		
		
			
				
					
					|  |  |  |             BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest); |  |  |  |             BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |