|  |  | @ -318,21 +318,30 @@ public class IoOrderServiceImpl implements IoOrderService { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 //更新扫码单据详情
 |  |  |  |                 //更新扫码单据详情
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); |  |  |  |                 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 if (ioOrderDetailCodeEntity != null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); |  |  |  |                     ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); |  |  |  |                     ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 //更新结果详情
 |  |  |  |                 //更新结果详情
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); |  |  |  |                 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 if (ioOrderDetailResultEntity != null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); |  |  |  |                     ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderDetailResultService.update(ioOrderDetailResultEntity); |  |  |  |                     ioOrderDetailResultService.update(ioOrderDetailResultEntity); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |             } else { |  |  |  |             } else { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode()); |  |  |  |                 int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 //如果数量扣减之后为0,直接删除此条码
 |  |  |  |                 //如果数量扣减之后为0,直接删除此条码
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 codeService.deleteById(ioCodeEntity.getId()); |  |  |  |                 codeService.deleteById(ioCodeEntity.getId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 //更新扫码单据详情
 |  |  |  |                 //更新扫码单据详情
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); |  |  |  |                 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 if (ioOrderDetailCodeEntity != null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); |  |  |  |                     ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); |  |  |  |                     ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 //更新结果详情
 |  |  |  |                 //更新结果详情
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); |  |  |  |                 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); | 
			
		
	
	
		
		
			
				
					|  |  | @ -754,7 +763,7 @@ public class IoOrderServiceImpl implements IoOrderService { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     @Override |  |  |  |     @Override | 
			
		
	
		
		
			
				
					
					|  |  |  |     public List<IoOrderEntity> filterOrderTrace(String billNo) { |  |  |  |     public List<IoOrderEntity> filterOrderTrace(String billNo) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo).in("status",5,7,10).in("dealStatus",2,3,4)); |  |  |  |         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo).in("status", 5, 7, 10).in("dealStatus", 2, 3, 4)); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (null == order) { |  |  |  |         if (null == order) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             return Collections.emptyList(); |  |  |  |             return Collections.emptyList(); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |