|  | @@ -724,8 +724,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 | 
											
												
													
														|  |  	   */
 |  |  	   */
 | 
											
												
													
														|  |  	  @RequestMapping(value = "/exportXls")
 |  |  	  @RequestMapping(value = "/exportXls")
 | 
											
												
													
														|  |  	public ModelAndView exportXls(HttpServletRequest request, SyPreAssembledPackingList syPreAssembledPackingList) throws Exception {
 |  |  	public ModelAndView exportXls(HttpServletRequest request, SyPreAssembledPackingList syPreAssembledPackingList) throws Exception {
 | 
											
												
													
														|  | -		// Step.1 组装查询条件
 |  | 
 | 
											
												
													
														|  | -		QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +	  	// Step.1 组装查询条件
 | 
											
												
													
														|  | 
 |  | +		/*QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
 | 
											
												
													
														|  |  		queryWrapper.eq("del_flag","0");
 |  |  		queryWrapper.eq("del_flag","0");
 | 
											
												
													
														|  |  		//Step.2 获取导出数据
 |  |  		//Step.2 获取导出数据
 | 
											
												
													
														|  |  		List<SyPreAssembledPackingList> syPreAssembledPackingListList = syPreAssembledPackingListService.list(queryWrapper);
 |  |  		List<SyPreAssembledPackingList> syPreAssembledPackingListList = syPreAssembledPackingListService.list(queryWrapper);
 | 
											
										
											
												
													
														|  | @@ -772,7 +773,8 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 | 
											
												
													
														|  |  		  maps.put("orderNumber","订单号");
 |  |  		  maps.put("orderNumber","订单号");
 | 
											
												
													
														|  |  		  mv.addObject(TemplateExcelConstants.PARAMS,templateExcelConstants);
 |  |  		  mv.addObject(TemplateExcelConstants.PARAMS,templateExcelConstants);
 | 
											
												
													
														|  |  		  mv.addObject(TemplateExcelConstants.MAP_DATA, maps);
 |  |  		  mv.addObject(TemplateExcelConstants.MAP_DATA, maps);
 | 
											
												
													
														|  | -		  return mv;
 |  | 
 | 
											
												
													
														|  | 
 |  | +		  return mv;*/
 | 
											
												
													
														|  | 
 |  | +		  return null;
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  	  /**
 |  |  	  /**
 |