| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -80,6 +80,7 @@ public class IoCheckInoutService {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    /**
 | 
					 | 
					 | 
					 | 
					    /**
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     * 判断是否需要手动校验
 | 
					 | 
					 | 
					 | 
					     * 判断是否需要手动校验
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					     *
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     * @param billNo
 | 
					 | 
					 | 
					 | 
					     * @param billNo
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     * @return
 | 
					 | 
					 | 
					 | 
					     * @return
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     */
 | 
					 | 
					 | 
					 | 
					     */
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -132,6 +133,7 @@ public class IoCheckInoutService {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    /**
 | 
					 | 
					 | 
					 | 
					    /**
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     * 校验流程  | 一次校验
 | 
					 | 
					 | 
					 | 
					     * 校验流程  | 一次校验
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					     *
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     * @param orderId
 | 
					 | 
					 | 
					 | 
					     * @param orderId
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					     */
 | 
					 | 
					 | 
					 | 
					     */
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    public void check(String orderId) {
 | 
					 | 
					 | 
					 | 
					    public void check(String orderId) {
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -782,6 +784,7 @@ public class IoCheckInoutService {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
 | 
					 | 
					 | 
					 | 
					        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
 | 
					 | 
					 | 
					 | 
					            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            orderEntity.setUpdateTime(new Date());
 | 
					 | 
					 | 
					 | 
					            orderEntity.setUpdateTime(new Date());
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					            if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                orderEntity.setCheckTime(new Date());
 | 
					 | 
					 | 
					 | 
					                orderEntity.setCheckTime(new Date());
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            orderService.update(orderEntity);
 | 
					 | 
					 | 
					 | 
					            orderService.update(orderEntity);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            checkSecond(orderEntity);
 | 
					 | 
					 | 
					 | 
					            checkSecond(orderEntity);
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -839,6 +842,7 @@ public class IoCheckInoutService {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
 | 
					 | 
					 | 
					 | 
					        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
 | 
					 | 
					 | 
					 | 
					            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            orderEntity.setUpdateTime(new Date());
 | 
					 | 
					 | 
					 | 
					            orderEntity.setUpdateTime(new Date());
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					            if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                orderEntity.setAuditTime(new Date());
 | 
					 | 
					 | 
					 | 
					                orderEntity.setAuditTime(new Date());
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
 | 
					 | 
					 | 
					 | 
					            if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                orderEntity.setReviewUser(orderEntity.getReviewUser());
 | 
					 | 
					 | 
					 | 
					                orderEntity.setReviewUser(orderEntity.getReviewUser());
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
 
 |