|  |  | @ -395,18 +395,18 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC | 
			
		
	
		
		
			
				
					
					|  |  |  |                 orderEntity.setUpdateTime(null); |  |  |  |                 orderEntity.setUpdateTime(null); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 orderEntity.setFromType(ConstantStatus.FROM_UDISP); |  |  |  |                 orderEntity.setFromType(ConstantStatus.FROM_UDISP); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 orderEntity.setReviewSp(true); |  |  |  |                 orderEntity.setReviewSp(true); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); |  |  |  | //                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                 IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); |  |  |  |                 IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 if (temp == null) { |  |  |  |                 if (temp == null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     orderEntity.setId(null); |  |  |  |                     orderEntity.setId(null); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     orderService.insertOrder(orderEntity); |  |  |  |                     orderService.insertOrder(orderEntity); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); |  |  |  |                     heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); |  |  |  | //                    orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                     addInoutService.dealProcess(orderEntity); |  |  |  | //                    addInoutService.dealProcess(orderEntity);
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                     orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); |  |  |  | //                    orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                     if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { |  |  |  | //                    if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                         ioCheckInoutService.check(orderEntity.getBillNo()); |  |  |  | //                        ioCheckInoutService.check(orderEntity.getBillNo());
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                     } |  |  |  | //                    }
 | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                 } |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |                 orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); |  |  |  |                 orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { |  |  |  |                 if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { | 
			
		
	
	
		
		
			
				
					|  |  | 
 |