修改采购单和采购变更单数据导出方法

src/main/java/com/uas/platform/b2b/controller/SaleOrderChangeController.java

@@ -368,13 +368,24 @@ public class SaleOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.ALL, method = RequestMethod.GET)
 	public ModelAndView exportChanges(PageParams params, String searchFilter) {
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data",getReceivedPurchaseOrderChanges(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter).getContent()
+				: getReceivedPurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_全部"));
 		logger.log("客户采购变更单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -389,12 +400,25 @@ public class SaleOrderChangeController {
 	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
 	public ModelAndView exportTodoChanges(PageParams params, String searchFilter) {
 		params.setPage(1);
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.NOT_REPLY.value());
+		pageInfo.filter("unNeedReply", Constant.NO);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		params.setCount(SearchConstants.TOP_NUM);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待确认");
-		modelAndView.addObject("data",getTodoPurchaseOrderChanges(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter).getContent()
+				: getTodoPurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_待确认"));
 		logger.log("客户采购变更单", "导出Excel列表", "导出待确认Excel列表");
 		return modelAndView;
@@ -408,13 +432,26 @@ public class SaleOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
 	public ModelAndView exportDoneChanges(PageParams params, String searchFilter) {
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.REPLIED.value());
+		pageInfo.filter("unNeedReply", Constant.NO);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已处理");
-		modelAndView.addObject("data",getDonePurchaseOrderChanges(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter).getContent()
+				: getDonePurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_已处理"));
 		logger.log("客户采购变更单", "导出Excel列表", "导出已处理Excel列表");
 		return modelAndView;
@@ -429,13 +466,26 @@ public class SaleOrderChangeController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.UNREAD, method = RequestMethod.GET)
 	public ModelAndView exportUnreadChanges(PageParams params, String searchFilter) {
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("unNeedReply", Constant.YES);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.sorting("date", org.springframework.data.domain.Sort.Direction.DESC);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "无需确认");
-		modelAndView.addObject("data",getUnReadPurchaseOrderChanges(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter).getContent()
+				: getUnReadPurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleChange", "客户采购变更单列表_无需确认"));
 		logger.log("客户采购变更单", "导出Excel列表", "导出无需确认Excel列表");
 		return modelAndView;

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -771,12 +771,22 @@ public class SaleOrderController {
 	public ModelAndView exportOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		PageParams params = new PageParams(pageInfo);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data", getPurchaseOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findAllDetailByPageInfo(pageInfo, filter).getContent()
+			: getPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_全部"));
 		logger.log("客户采购单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -791,13 +801,23 @@ public class SaleOrderController {
 	@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
 	public ModelAndView exportTodoOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待回复");
-		modelAndView.addObject("data", getTodoPurchaseOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getTodoPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表 _待回复"));
 		logger.log("客户采购单", "导出Excel列表", "导出待回复Excel列表");
 		return modelAndView;
@@ -812,13 +832,23 @@ public class SaleOrderController {
 	@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
 	public ModelAndView exportDoneOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", getDonePurchaseOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getDonePurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已回复"));
 		logger.log("客户采购单", "导出Excel列表", "导出已回复Excel列表");
 		return modelAndView;
@@ -833,13 +863,24 @@ public class SaleOrderController {
 	@RequestMapping(value = "/xls", params = RequestState.END, method = RequestMethod.GET)
 	public ModelAndView exportEndOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("end", Constant.YES);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已结案");
-		modelAndView.addObject("data", getEndPurchaseOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+                : getEndPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已结案"));
 		logger.log("客户采购单", "导出Excel列表", "导出已结案Excel列表");
 		return modelAndView;
@@ -854,13 +895,23 @@ public class SaleOrderController {
 	@RequestMapping(value = "/xls", params = RequestState.WAITING, method = RequestMethod.GET)
 	public ModelAndView exportWaitingOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", getWaitingPurchaseOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getWaitingPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_待交货"));
 		logger.log("客户采购单", "导出Excel列表", "导出待交货Excel列表");
 		return modelAndView;
@@ -874,13 +925,26 @@ public class SaleOrderController {
 	 */
 	@RequestMapping(value = "/xls", params = RequestState.RECEIVED, method = RequestMethod.GET)
 	public ModelAndView exportReceivedOrders(PageParams params, String searchFilter) {
+		PageInfo pageInfo = new PageInfo(params);
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("end", Constant.YES);
+		pageInfo.sorting("date", Direction.DESC);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已收货");
-		modelAndView.addObject("data", getReceivedPurchaseOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getReceivedPurchaseOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "客户采购单列表_已收货"));
 		logger.log("客户采购单", "导出Excel列表", "导出已收货Excel列表");
 		return modelAndView;
@@ -1132,12 +1196,15 @@ public class SaleOrderController {
 	public ModelAndView exportPurcOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-        PageParams params = new PageParams(pageInfo);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data", getAllPurcOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getAllPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_全部"));
 		logger.log("采购单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;
@@ -1153,12 +1220,15 @@ public class SaleOrderController {
 	public ModelAndView exportPurcTodoOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待回复");
-		modelAndView.addObject("data", getTodoPurcOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getTodoPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表 _待回复"));
 		logger.log("采购单", "导出Excel列表", "导出待回复Excel列表");
 		return modelAndView;
@@ -1174,12 +1244,15 @@ public class SaleOrderController {
 	public ModelAndView exportPurcDoneOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已回复");
-		modelAndView.addObject("data", getDonePurcOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getDonePurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已回复"));
 		logger.log("采购单", "导出Excel列表", "导出已回复Excel列表");
 		return modelAndView;
@@ -1195,12 +1268,15 @@ public class SaleOrderController {
 	public ModelAndView exportPurcEndOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已结案");
-		modelAndView.addObject("data", getEndPurcOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getEndPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_已结案"));
 		logger.log("采购单", "导出Excel列表", "导出已结案Excel列表");
 		return modelAndView;
@@ -1216,12 +1292,15 @@ public class SaleOrderController {
 	public ModelAndView exportPurcWaitingOrders(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+		pageInfo.sorting("date", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		PageParams params = new PageParams(pageInfo);
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "待交货");
-		modelAndView.addObject("data", getWaitingPurcOrderItems(params, searchFilter).getContent());
+		modelAndView.addObject("data", filter.getKeyword() == null ? purchaseOrderService.findOrdersByPageInfo(pageInfo, filter).getContent()
+				: getWaitingPurcOrderItems(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/saleOrder", "采购单列表_待交货"));
 		logger.log("采购单", "导出Excel列表", "导出待交货Excel列表");
 		return modelAndView;