|  |  | @ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |  |  |  | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.common.res.BaseResponse; |  |  |  | import com.glxp.api.common.res.BaseResponse; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.common.util.ResultVOUtils; |  |  |  | import com.glxp.api.common.util.ResultVOUtils; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.entity.basic.BasicSkPrescribeEntity; |  |  |  | import com.glxp.api.entity.basic.BasicSkPrescribeEntity; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; |  |  |  | import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.entity.collect.IoCollectOrder; |  |  |  | import com.glxp.api.entity.collect.IoCollectOrder; | 
			
		
	
	
		
		
			
				
					|  |  | @ -16,10 +17,12 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.exception.JsonException; |  |  |  | import com.glxp.api.exception.JsonException; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.http.ErpBasicClient; |  |  |  | import com.glxp.api.http.ErpBasicClient; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.req.basic.GetSickPrescribeRequest; |  |  |  | import com.glxp.api.req.basic.GetSickPrescribeRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | import com.glxp.api.req.basic.WorkBindBusTypeRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.req.collect.CollectOrderRequest; |  |  |  | import com.glxp.api.req.collect.CollectOrderRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.req.inout.FilterOrderRequest; |  |  |  | import com.glxp.api.req.inout.FilterOrderRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.res.PageSimpleResponse; |  |  |  | import com.glxp.api.res.PageSimpleResponse; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.res.basic.BasicSkPrescribeResponse; |  |  |  | import com.glxp.api.res.basic.BasicSkPrescribeResponse; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.api.service.basic.*; |  |  |  | import com.glxp.api.service.basic.*; | 
			
		
	
		
		
			
				
					
					|  |  |  | import org.springframework.stereotype.Service; |  |  |  | import org.springframework.stereotype.Service; | 
			
		
	
		
		
			
				
					
					|  |  |  | import org.springframework.transaction.annotation.Transactional; |  |  |  | import org.springframework.transaction.annotation.Transactional; | 
			
		
	
	
		
		
			
				
					|  |  | @ -49,6 +52,8 @@ public class IoCollectOriginService { | 
			
		
	
		
		
			
				
					
					|  |  |  |     IoCollectOrderBizService collectOrderBizService; |  |  |  |     IoCollectOrderBizService collectOrderBizService; | 
			
		
	
		
		
			
				
					
					|  |  |  |     @Resource |  |  |  |     @Resource | 
			
		
	
		
		
			
				
					
					|  |  |  |     private DownloadFactory downloadFactory; |  |  |  |     private DownloadFactory downloadFactory; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     @Resource | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     private SysWorkplaceDocumentDao sysWorkplaceDocumentDao; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { |  |  |  |     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -93,7 +98,23 @@ public class IoCollectOriginService { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) { |  |  |  |     public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         //条件
 |  |  |  |         //条件
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         return downloadFactory.downloadOrder(collectOrderRequest); |  |  |  |         String busType = collectOrderRequest.getBusType(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         if(StrUtil.isBlank(busType)){ | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             //下载工位下的类型
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterList(workBindBusTypeRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             if(CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){ | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 for (SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse :sysWorkplaceDocumentResponses){ | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     String documentTypeCode = sysWorkplaceDocumentResponse.getDocumentTypeCode(); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     collectOrderRequest.setBusType(documentTypeCode); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     downloadFactory.downloadOrder(collectOrderRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             return ResultVOUtils.success("下载成功"); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         }else{ | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             return downloadFactory.downloadOrder(collectOrderRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | 
 |