|  |  |  | @ -123,6 +123,9 @@ public class IoCodeTempController extends BaseController { | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     IoCollectSetService collectSetService; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     SysWorkplaceFreightService sysWorkplaceFreightService; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     /** | 
			
		
	
		
			
				
					|  |  |  |  |      * PDA-----单据上传 | 
			
		
	
	
		
			
				
					|  |  |  | @ -1732,13 +1735,16 @@ public class IoCodeTempController extends BaseController { | 
			
		
	
		
			
				
					|  |  |  |  |                             } | 
			
		
	
		
			
				
					|  |  |  |  |                         } else { | 
			
		
	
		
			
				
					|  |  |  |  |                             //判断产品是否已经绑定其他槽位
 | 
			
		
	
		
			
				
					|  |  |  |  | //                            SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId()));
 | 
			
		
	
		
			
				
					|  |  |  |  | //                            if (workplaceQueue1 != null) {
 | 
			
		
	
		
			
				
					|  |  |  |  | //                                if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) {
 | 
			
		
	
		
			
				
					|  |  |  |  | ////                                orderService.deleteByBillNo(orderId);
 | 
			
		
	
		
			
				
					|  |  |  |  | //                                    return ResultVOUtils.error(507, "当前产品已绑定在" + workplaceQueue1.getCode() + "取货槽");
 | 
			
		
	
		
			
				
					|  |  |  |  | //                                }
 | 
			
		
	
		
			
				
					|  |  |  |  | //                            }
 | 
			
		
	
		
			
				
					|  |  |  |  |                             SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId())); | 
			
		
	
		
			
				
					|  |  |  |  |                             String freightCode = workplaceQueue1.getFreightCode(); | 
			
		
	
		
			
				
					|  |  |  |  |                             SysWorkplaceFreight one = sysWorkplaceFreightService.getOne(new LambdaQueryWrapper<SysWorkplaceFreight>().eq(SysWorkplaceFreight::getCode,freightCode)); | 
			
		
	
		
			
				
					|  |  |  |  |                             Integer isSingQueue = one.getIsSingQueue(); | 
			
		
	
		
			
				
					|  |  |  |  |                             if (workplaceQueue1 != null && isSingQueue == 1) { | 
			
		
	
		
			
				
					|  |  |  |  |                                 if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) { | 
			
		
	
		
			
				
					|  |  |  |  | //                                orderService.deleteByBillNo(orderId);
 | 
			
		
	
		
			
				
					|  |  |  |  |                                     return ResultVOUtils.error(507, "当前货架已启用单品种槽位且产品已绑定在" + workplaceQueue1.getCode() + "取货槽"); | 
			
		
	
		
			
				
					|  |  |  |  |                                 } | 
			
		
	
		
			
				
					|  |  |  |  |                             } | 
			
		
	
		
			
				
					|  |  |  |  |                         } | 
			
		
	
		
			
				
					|  |  |  |  |                     } else { | 
			
		
	
		
			
				
					|  |  |  |  |                         return ResultVOUtils.error(500, "取货槽位不存在!"); | 
			
		
	
	
		
			
				
					|  |  |  | 
 |