|  |  |  | @ -179,45 +179,47 @@ public class IoCodeTempController extends BaseController { | 
			
		
	
		
			
				
					|  |  |  |  |             if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) { | 
			
		
	
		
			
				
					|  |  |  |  |                 collectOrder = collectOrderService.unionSearch(null, null, code); | 
			
		
	
		
			
				
					|  |  |  |  |                 //=============================================//
 | 
			
		
	
		
			
				
					|  |  |  |  |                 if (collectOrder == null) { | 
			
		
	
		
			
				
					|  |  |  |  |                     BaseResponse response = ResultVOUtils.error(501, "查无此单据号,先选择要处理的单据"); | 
			
		
	
		
			
				
					|  |  |  |  |                     response.setData(code); | 
			
		
	
		
			
				
					|  |  |  |  |                 if (collectOrder != null) { | 
			
		
	
		
			
				
					|  |  |  |  |                     collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); | 
			
		
	
		
			
				
					|  |  |  |  |                     collectOrder.setBusType(addEnterCodeRequest.getBusType()); | 
			
		
	
		
			
				
					|  |  |  |  |                     IoCollectOrder ioCollectOrder = new IoCollectOrder(); | 
			
		
	
		
			
				
					|  |  |  |  |                     BeanUtils.copyProperties(collectOrder, ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                     collectOrderService.updateById(ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |                     BaseResponse response = ResultVOUtils.error(601, code); | 
			
		
	
		
			
				
					|  |  |  |  |                     response.setData(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                     return response; | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  |                 collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); | 
			
		
	
		
			
				
					|  |  |  |  |                 collectOrder.setBusType(addEnterCodeRequest.getBusType()); | 
			
		
	
		
			
				
					|  |  |  |  |                 IoCollectOrder ioCollectOrder = new IoCollectOrder(); | 
			
		
	
		
			
				
					|  |  |  |  |                 BeanUtils.copyProperties(collectOrder, ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                 collectOrderService.updateById(ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |                 BaseResponse response = ResultVOUtils.error(601, code); | 
			
		
	
		
			
				
					|  |  |  |  |                 response.setData(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                 return response; | 
			
		
	
		
			
				
					|  |  |  |  |             } else { | 
			
		
	
		
			
				
					|  |  |  |  |                 BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); | 
			
		
	
		
			
				
					|  |  |  |  |                 if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) { | 
			
		
	
		
			
				
					|  |  |  |  |                     collectOrder = collectOrderService.unionSearch(null, null, code); | 
			
		
	
		
			
				
					|  |  |  |  |                     //=============================================//
 | 
			
		
	
		
			
				
					|  |  |  |  |                     if (collectOrder != null) { | 
			
		
	
		
			
				
					|  |  |  |  |                         collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); | 
			
		
	
		
			
				
					|  |  |  |  |                         collectOrder.setBusType(addEnterCodeRequest.getBusType()); | 
			
		
	
		
			
				
					|  |  |  |  |                         IoCollectOrder ioCollectOrder = new IoCollectOrder(); | 
			
		
	
		
			
				
					|  |  |  |  |                         BeanUtils.copyProperties(collectOrder, ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                         collectOrderService.updateById(ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                         BaseResponse response = ResultVOUtils.error(601, code); | 
			
		
	
		
			
				
					|  |  |  |  |                         response.setData(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                         return response; | 
			
		
	
		
			
				
					|  |  |  |  |                 } else { | 
			
		
	
		
			
				
					|  |  |  |  |                     BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) { | 
			
		
	
		
			
				
					|  |  |  |  |                         collectOrder = collectOrderService.unionSearch(null, null, code); | 
			
		
	
		
			
				
					|  |  |  |  |                         //=============================================//
 | 
			
		
	
		
			
				
					|  |  |  |  |                         if (collectOrder != null) { | 
			
		
	
		
			
				
					|  |  |  |  |                             collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); | 
			
		
	
		
			
				
					|  |  |  |  |                             collectOrder.setBusType(addEnterCodeRequest.getBusType()); | 
			
		
	
		
			
				
					|  |  |  |  |                             IoCollectOrder ioCollectOrder = new IoCollectOrder(); | 
			
		
	
		
			
				
					|  |  |  |  |                             BeanUtils.copyProperties(collectOrder, ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                             collectOrderService.updateById(ioCollectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                             BaseResponse response = ResultVOUtils.error(601, code); | 
			
		
	
		
			
				
					|  |  |  |  |                             response.setData(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |                             return response; | 
			
		
	
		
			
				
					|  |  |  |  |                         } | 
			
		
	
		
			
				
					|  |  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  |                 BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage()); | 
			
		
	
		
			
				
					|  |  |  |  |                 BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据"); | 
			
		
	
		
			
				
					|  |  |  |  |                 response.setData(code); | 
			
		
	
		
			
				
					|  |  |  |  |                 return response; | 
			
		
	
		
			
				
					|  |  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |  |         } else { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         }else  { | 
			
		
	
		
			
				
					|  |  |  |  |             BaseResponse response = ResultVOUtils.error(601, code); | 
			
		
	
		
			
				
					|  |  |  |  |             response.setData(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |             return response; | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据"); | 
			
		
	
		
			
				
					|  |  |  |  |         response.setData(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |         return response; | 
			
		
	
		
			
				
					|  |  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     //前端扫码完整性校验
 | 
			
		
	
	
		
			
				
					|  |  |  | 
 |