链接调整

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

@@ -287,7 +287,7 @@ public class BaseInfoController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);
 	}
@@ -451,7 +451,7 @@ public class BaseInfoController {
 	}
 
 	/**
-	 * 通过关键词查询账户中心的相关的企业信息
+	 * 顶部通过关键词查询账户中心的相关的企业信息
 	 * 
 	 * @param keyword
 	 * @param params
@@ -466,7 +466,7 @@ public class BaseInfoController {
 	}
 	
 	/**
-	 * 查询物料库所有物料
+	 * 顶部查询物料库所有物料
 	 * 
 	 * @param params
 	 * @param keyword

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

@@ -348,7 +348,7 @@ public class DeputyOrderController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/getOrderDetail/{id}/info", method = RequestMethod.GET)
+	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
 	private DeputyOrder getOrderDetail(@PathVariable Long id) {
 		return deputyOrderService.getOrderDetail(id);
 	}
@@ -372,6 +372,17 @@ public class DeputyOrderController {
 		return deputyOrderService.clearOrder(id);
 	}
 
+	/**
+	 * 打印权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/printCount/permission", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap printPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 打印订单，增加打印次数
 	 * 记录打印日志

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

@@ -125,7 +125,7 @@ public class MakeOrderChangeController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -62,7 +62,7 @@ public class MakeOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/status", method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<MakeOrder> getAllMakeOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括委外明细）（全部）");
@@ -96,7 +96,7 @@ public class MakeOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/status", params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<MakeOrder> getDoneMakeOrders(PageParams params, String searchFilter) {
 		logger.log("委外加工单", "查看收到的委外加工单列表（已回复）");
@@ -132,7 +132,7 @@ public class MakeOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/status", params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<MakeOrder> getToDoMakeOrders(PageParams params, String searchFilter) {
 		logger.log("委外加工单", "查看收到的委外加工单列表（未回复）");
@@ -168,7 +168,7 @@ public class MakeOrderController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/status", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<MakeOrder> getEndMakeOrders(PageParams params, String searchFilter) {
 		logger.log("委外加工单", "查看收到的委外加工单列表（已结案）");
@@ -238,6 +238,17 @@ public class MakeOrderController {
 		return makeOrderService.findById(id);
 	}
 
+	/**
+	 * 打印权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/printCount/permission", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap printPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 作为卖家，根据委外单据ID查找委外加工订单(含明细)
 	 * 
@@ -257,7 +268,7 @@ public class MakeOrderController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -63,7 +63,7 @@ public class MakeOutOrderController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<MakeOrder> getAllMakeOutOrders(PageParams params, String searchFilter) {
 		logger.log("委外加工单", "查看委托客户加工的单据列表（全部）");
@@ -97,7 +97,7 @@ public class MakeOutOrderController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
 	@ResponseBody
 	public MakeOrder getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
 		logger.log("自己委外加工单", "获取单个自己委外加工单，id:" + id);

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

@@ -121,8 +121,8 @@ public class PurcInquiryController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/submit/{id}", method = RequestMethod.POST)
-	private ModelMap sumbit(@PathVariable Long id) {
+	@RequestMapping(value = "/submit/update", method = RequestMethod.POST)
+	private ModelMap sumbit(Long id) {
 		return purcInquiryService.sumbit(id);
 	}
 
@@ -358,8 +358,8 @@ public class PurcInquiryController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/pubishInquiry/{id}", method = RequestMethod.POST)
-	private ModelMap pubishInquiry(@PathVariable Long id) {
+	@RequestMapping(value = "/submit/updatePublic", method = RequestMethod.POST)
+	private ModelMap pubishInquiry(Long id) {
 		return purcInquiryService.pubishInquiry(id);
 	}
 
@@ -412,7 +412,7 @@ public class PurcInquiryController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
 	private InquiryDetailInfo getDetail(@PathVariable Long id) {
 		return purcInquiryService.getInquiryDetail(id);
 	}

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

@@ -61,7 +61,7 @@ public class SaleApBillController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseApBill> getReceivedPurchaseApBills(PageParams params, String searchFilter) {
 		logger.log("客户应付发票", "获取全部客户应付发票");

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

@@ -292,7 +292,7 @@ public class SaleApCheckController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "作为买家，获取全部应收对账单");
@@ -323,7 +323,7 @@ public class SaleApCheckController {
 	/**
 	 * 作为卖家，获取应收对账单（未对账）
 	 */
-	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseApCheck> getTodoApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "获取未对账应收对账单");
@@ -357,7 +357,7 @@ public class SaleApCheckController {
 	/**
 	 * 作为卖家，获取应收对账单（已确认）
 	 */
-	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseApCheck> getDoneApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "获取已确认应收对账单");
@@ -389,7 +389,7 @@ public class SaleApCheckController {
 	/**
 	 * 作为卖家，获取应收对账单（不同意）
 	 */
-	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseApCheck> getEndApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "获取不同意，已作废应收对账单");
@@ -427,7 +427,7 @@ public class SaleApCheckController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(value = "/allxls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/list", method = RequestMethod.GET)
 	public ModelAndView exportApCheck(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
@@ -450,7 +450,7 @@ public class SaleApCheckController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(value = "/allxls", params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/list", params = RequestState.DONE, method = RequestMethod.GET)
 	public ModelAndView exportApCheckDone(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
@@ -473,7 +473,7 @@ public class SaleApCheckController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(value = "/allxls", params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/list", params = RequestState.TODO, method = RequestMethod.GET)
 	public ModelAndView exportApCheckTodo(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
@@ -496,7 +496,7 @@ public class SaleApCheckController {
 	 * @param searchFilter
 	 * @return
 	 */
-	@RequestMapping(value = "/allxls", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/list", params = RequestState.END, method = RequestMethod.GET)
 	public ModelAndView exportApChecks(String searchFilter) {
 		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);

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

@@ -482,10 +482,10 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价明细
+	 * 作为卖家，收到的采购询价明细（手机端）
 	 * 
 	 */
-	@RequestMapping(value = "/items/{inquiryItemId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/{inquiryItemId}/info/mobile", method = RequestMethod.GET)
 	@ResponseBody
 	public PurchaseInquiryItem getInquiryItemById(@PathVariable("inquiryItemId") Long inquiryItemId) {
 		PurchaseInquiryItem item = purchaseInquiryService.findItemByItemId(inquiryItemId);
@@ -560,7 +560,7 @@ public class SaleInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -463,7 +463,7 @@ public class SaleInquiryMouldController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -112,94 +112,9 @@ public class SaleNoticeController {
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
 
-	/**
-	 * 作为卖家，收到的送货提醒(待发货) -不搜索
-	 *
-	 * @param params
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<PurchaseNotice> getTodoPurchaseNoticesInfo(PageParams params, String keyword, Long fromDate, Long endDate) {
-		SearchFilter filter = new SearchFilter();
-		filter.setEndDate(endDate);
-		filter.setFromDate(fromDate);
-		SearchFilter disfilter = userService.distribute();
-		if (disfilter != null && disfilter.getDistribute() == null) {
-			return null;
-		}
-		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			list.addAll(disfilter.getDistribute());
-			filter.setDistribute(list);
-		}
-		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		pageInfo.filter("status", (short)Status.NOT_REPLY.value());
-		pageInfo.filter("waiting", Constant.NO);
-		return purchaseNoticeService.findAllNoticesByPageInfo(pageInfo, null, filter);
-	}
-
-	/**
-	 * 作为卖家，收到的送货提醒(已发货)
-	 *
-	 * @param params
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	@RequestMapping(value = "/info/nosearch", params = RequestState.DONE, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<PurchaseNotice> getDonePurchaseNoticesInfo(PageParams params, String keyword, Long fromDate, Long endDate) {
-		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（已发货）");
-		SearchFilter filter = new SearchFilter();
-		filter.setEndDate(endDate);
-		filter.setFromDate(fromDate);
-		SearchFilter disfilter = userService.distribute();
-		if (disfilter != null && disfilter.getDistribute() == null) {
-			return null;
-		}
-		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			list.addAll(disfilter.getDistribute());
-			filter.setDistribute(list);
-		}
-		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		pageInfo.filter("status", (short)Status.REPLIED.value());
-		return purchaseNoticeService.findDoneNoticesByPageInfo(pageInfo, null, filter);
-	}
-
-
-	/**
-	 * 作为卖家，收到的送货提醒，对应id
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseNotice getReceivedPurchaseNoticeById(@PathVariable("id") Long id) {
-		logger.log("客户送货提醒", "查看单个客户送货提醒", null, null, id);
-		return purchaseNoticeService.findById(id);
-	}
-
-	/**
-	 * 作为卖家，收到的送货提醒，对应id
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}/sendItems", method = RequestMethod.GET)
-	@ResponseBody
-	public List<SaleSendItem> getSendItemsNoticeById(@PathVariable("id") Long id) {
-		logger.log("客户送货提醒", "查看单个客户送货提醒的发货记录", null, null, id);
-		return purchaseNoticeService.findSendById(id);
-	}
-
 	/**
 	 * 作为卖家，收到的送货提醒(待发货)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 * @throws UnsupportedEncodingException
@@ -238,7 +153,7 @@ public class SaleNoticeController {
 
 	/**
 	 * 作为卖家，收到的送货提醒(已发货)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 * @throws UnsupportedEncodingException
@@ -277,7 +192,7 @@ public class SaleNoticeController {
 
 	/**
 	 * 作为卖家，收到的送货提醒(备料中)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 * @throws UnsupportedEncodingException
@@ -285,7 +200,7 @@ public class SaleNoticeController {
 	@RequestMapping(value = "/info/search", params = RequestState.WAITING, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseNotice> getWaitingPurchaseNotices(PageParams params, String keyword, Long fromDate,
-			Long endDate){
+														   Long endDate){
 		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（备料中）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pn_venduu", SystemSession.getUser().getEnterprise().getUu());
@@ -316,7 +231,7 @@ public class SaleNoticeController {
 
 	/**
 	 * 作为卖家，收到的送货提醒(已结案)
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 * @throws UnsupportedEncodingException
@@ -352,6 +267,92 @@ public class SaleNoticeController {
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
 
+	/**
+	 * 作为卖家，收到的送货提醒(待发货) -不搜索
+	 *
+	 * @param params
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/info/nosearch", params = RequestState.TODO, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseNotice> getTodoPurchaseNoticesInfo(PageParams params, String keyword, Long fromDate, Long endDate) {
+		SearchFilter filter = new SearchFilter();
+		filter.setEndDate(endDate);
+		filter.setFromDate(fromDate);
+		SearchFilter disfilter = userService.distribute();
+		if (disfilter != null && disfilter.getDistribute() == null) {
+			return null;
+		}
+		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.addAll(disfilter.getDistribute());
+			filter.setDistribute(list);
+		}
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("status", (short)Status.NOT_REPLY.value());
+		pageInfo.filter("waiting", Constant.NO);
+		return purchaseNoticeService.findAllNoticesByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的送货提醒(已发货)
+	 *
+	 * @param params
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/info/nosearch", params = RequestState.DONE, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseNotice> getDonePurchaseNoticesInfo(PageParams params, String keyword, Long fromDate, Long endDate) {
+		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（已发货）");
+		SearchFilter filter = new SearchFilter();
+		filter.setEndDate(endDate);
+		filter.setFromDate(fromDate);
+		SearchFilter disfilter = userService.distribute();
+		if (disfilter != null && disfilter.getDistribute() == null) {
+			return null;
+		}
+		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.addAll(disfilter.getDistribute());
+			filter.setDistribute(list);
+		}
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("status", (short)Status.REPLIED.value());
+		return purchaseNoticeService.findDoneNoticesByPageInfo(pageInfo, null, filter);
+	}
+
+
+	/**
+	 * 作为卖家，收到的送货提醒，对应id
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@ResponseBody
+	public PurchaseNotice getReceivedPurchaseNoticeById(@PathVariable("id") Long id) {
+		logger.log("客户送货提醒", "查看单个客户送货提醒", null, null, id);
+		return purchaseNoticeService.findById(id);
+	}
+
+	/**
+	 * 作为卖家，收到的送货提醒，对应id
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}/sendItems", method = RequestMethod.GET)
+	@ResponseBody
+	public List<SaleSendItem> getSendItemsNoticeById(@PathVariable("id") Long id) {
+		logger.log("客户送货提醒", "查看单个客户送货提醒的发货记录", null, null, id);
+		return purchaseNoticeService.findSendById(id);
+	}
+
+
 	/**
 	 * 作为卖家，针对送货提醒发货
 	 * 
@@ -408,7 +409,7 @@ public class SaleNoticeController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/sends", method = RequestMethod.GET)
+	@RequestMapping(value = "/sends/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<SaleSendAll> getSaleSends(PageParams params, String keyword, Long fromDate, Long endDate) {
 		logger.log("发货单", "查看全部的发货单");
@@ -438,66 +439,13 @@ public class SaleNoticeController {
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
 
-	/**
-	 * 作为卖家，查看单个发货单
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/sends/{id}/info", method = RequestMethod.GET)
-	@ResponseBody
-	public SaleSendAll getSaleSendsById(PageParams params, @PathVariable("id") Long id) {
-		logger.log("发货单", "查看单个送货单", "根据Id查找", "", id);
-		return purchaseNoticeService.findSaleSendById(id);
-	}
-
-	/**
-	 * 打印权限判断
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/sends/print/permission", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap printPermission() {
-		return new ModelMap("success", true);
-	}
-
-	/**
-	 * 增加发货单打印次数
-	 *
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/sends/print/{id}", method = RequestMethod.POST)
-	@ResponseBody
-	public void printCount(PageParams params, @PathVariable("id") Long id) {
-		logger.log("发货单", "打印单个发货单", "根据Id查找", "", id);
-		purchaseNoticeService.printCount(id);
-	}
-
-	/**
-	 * 更新发货单的条码规则
-	 * 
-	 * @param json
-	 */
-	@RequestMapping(value = "/sends/{id}", method = RequestMethod.POST)
-	@ResponseBody
-	public void updateSaleSend(@RequestBody String json) {
-		SaleSendItem saleSendItem = FlexJsonUtils.fromJson(json, SaleSendItem.class);
-		if (saleSendItem != null && saleSendItem.getId() != null) {
-			logger.log("条码维护", "保存条码数据", "根据Id查找", "", saleSendItem.getId());
-			purchaseNoticeService.updateBarCode(saleSendItem.getId(), saleSendItem.getPackageQty(),
-					saleSendItem.getOutBoxQty());
-		}
-	}
-
 	/**
 	 * 作为卖家，查看送货单-已收料
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/sends", params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/sends/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<SaleSendAll> getReceivedSaleSends(PageParams params, String keyword, Long fromDate, Long endDate) {
 		logger.log("发货单", "查看全部的送货单");
@@ -531,11 +479,11 @@ public class SaleNoticeController {
 
 	/**
 	 * 作为卖家，查看送货单-未收料（包括部分收料）
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/sends", params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/sends/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<SaleSendAll> getUnReceivedSaleSends(PageParams params, String keyword, Long fromDate, Long endDate) {
 		logger.log("发货单", "查看全部的送货单");
@@ -566,6 +514,59 @@ public class SaleNoticeController {
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
 
+	/**
+	 * 作为卖家，查看单个发货单
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/sends/{id}/info", method = RequestMethod.GET)
+	@ResponseBody
+	public SaleSendAll getSaleSendsById(PageParams params, @PathVariable("id") Long id) {
+		logger.log("发货单", "查看单个送货单", "根据Id查找", "", id);
+		return purchaseNoticeService.findSaleSendById(id);
+	}
+
+	/**
+	 * 打印权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/sends/print/permission", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap printPermission() {
+		return new ModelMap("success", true);
+	}
+
+	/**
+	 * 增加发货单打印次数
+	 *
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/sends/print/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	public void printCount(PageParams params, @PathVariable("id") Long id) {
+		logger.log("发货单", "打印单个发货单", "根据Id查找", "", id);
+		purchaseNoticeService.printCount(id);
+	}
+
+	/**
+	 * 更新发货单的条码规则
+	 * 
+	 * @param json
+	 */
+	@RequestMapping(value = "/sends/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	public void updateSaleSend(@RequestBody String json) {
+		SaleSendItem saleSendItem = FlexJsonUtils.fromJson(json, SaleSendItem.class);
+		if (saleSendItem != null && saleSendItem.getId() != null) {
+			logger.log("条码维护", "保存条码数据", "根据Id查找", "", saleSendItem.getId());
+			purchaseNoticeService.updateBarCode(saleSendItem.getId(), saleSendItem.getPackageQty(),
+					saleSendItem.getOutBoxQty());
+		}
+	}
+
 	/**
 	 * 导出权限判断
 	 *

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

@@ -353,7 +353,7 @@ public class SaleOrderChangeController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -150,6 +150,17 @@ public class SaleOrderController {
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
+	/**
+	 * 打印权限判断（采购方）
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/custPrintCount/permission", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap custPrintPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 打印订单，增加打印次数（采购方）
 	 * 记录打印日志
@@ -715,7 +726,7 @@ public class SaleOrderController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -470,7 +470,7 @@ public class SaleQuotationController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/item/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
 	@ResponseBody
 	public SaleQuotationItem getQuotationItem(@PathVariable("id") Long id) {
 		logger.log("主动报价单", "查找主动报价明细", id.toString());
@@ -482,7 +482,7 @@ public class SaleQuotationController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);

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

@@ -391,7 +391,7 @@ public class SaleSampleController {
 	 * @param endDate
 	 * @return
 	 */
-	@RequestMapping(value = "/approval", method = RequestMethod.GET)
+	@RequestMapping(value = "/approval/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseProofingApproval> getProofingApprovals(PageParams params, String keyword, Long fromDate,
 			Long endDate) {
@@ -432,7 +432,7 @@ public class SaleSampleController {
 	 * @param endDate
 	 * @return
 	 */
-	@RequestMapping(value = "/approval", params = RequestState.AGREED, method = RequestMethod.GET)
+	@RequestMapping(value = "/approval/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseProofingApproval> getQualifiedProofingApprovals(PageParams params, String keyword, Long fromDate,
 																Long endDate) {
@@ -477,7 +477,7 @@ public class SaleSampleController {
 	 * @param endDate
 	 * @return
 	 */
-	@RequestMapping(value = "/approval", params = RequestState.REFUSED, method = RequestMethod.GET)
+	@RequestMapping(value = "/approval/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseProofingApproval> getUnqualifiedProofingApprovals(PageParams params, String keyword, Long fromDate,
 																Long endDate) {
@@ -516,7 +516,7 @@ public class SaleSampleController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/approval/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/approval/{id}/info", method = RequestMethod.GET)
 	@ResponseBody
 	public PurchaseProofingApproval getProofingDetailApproval(@PathVariable("id") Long id) {
 		logger.log("客户认定单", "查看所有客户认定单详情界面");

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

@@ -49,7 +49,7 @@ public class VendorController {
 	/**
 	 * 获取供应商
 	 */
-	@RequestMapping(method = RequestMethod.GET)
+	@RequestMapping(value= "/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Vendor> getVendors(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
@@ -91,7 +91,7 @@ public class VendorController {
 	/**
 	 * 获取客户
 	 */
-	@RequestMapping(value = "/customer", method = RequestMethod.GET)
+	@RequestMapping(value = "/customer/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Vendor> getCustomers(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
@@ -149,7 +149,7 @@ public class VendorController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/customer/permission/xls", method = RequestMethod.GET)
+	@RequestMapping(value = "/customer/xls/permission", method = RequestMethod.GET)
 	public ModelMap exportVendorsPermission() {
 		return new ModelMap("success", true);
 	}

src/main/webapp/resources/js/common/services.js

@@ -264,11 +264,11 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                     success.call(null, data);
                 });
             },
-            customer: $resource('vendor/customer/:id', {}),
+            customer: $resource('vendor/customer/info/search', {}),
             vendor: $resource('vendor/:id', {}),
             userInfo: $resource('vendor/userInfo/:uu', {}),
             user: $resource('vendor/user', {}),
-            exportXls: $resource('vendor/customer/permission/xls', {})
+            exportXls: $resource('vendor/customer/xls/permission', {})
         };
     }]).factory('AccountUser', ['$resource', function($resource) {
         return $resource('account/user/:uu', {}, {

src/main/webapp/resources/js/index/app.js

@@ -2746,8 +2746,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
             // 需方  打印    采购单
             $scope.custPrint = function (order) {
-                PurcOrder.custPrintCount({id: order.id}, {});//增加打印此次
-                ReportService.print(order.enUU, 'PURCLIST_CUST', "where purc$orders.pu_id=" + order.id);
+                PurcOrder.printPermission({}, function () {
+                    PurcOrder.custPrintCount({id: order.id}, {});//增加打印此次
+                    ReportService.print(order.enUU, 'PURCLIST_CUST', "where purc$orders.pu_id=" + order.id);
+                }, function (response) {
+                    toaster.pop('error', '打印失败', response.data);
+                });
             };
 
             $scope.openDatePicker = function ($event, item, openParam) {
@@ -9658,7 +9662,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             FaApCheck.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + '/sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12400,7 +12404,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeOutOrder.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + '/make/outorders/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12418,7 +12422,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.isUser = data.isUser;
         });
         var loadData = function () {
-            MakeOutOrder.get({id: $stateParams.id}, function (data) {
+            MakeOutOrder.getItem({id: $stateParams.id}, function (data) {
                 $scope.order = data;
                 var sum = $scope.order.qty * $scope.order.price;
                 $scope.order.total = sum;

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -95,7 +95,7 @@ define(['ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: 'product/baseInfo/permission/xls',
+				url: 'product/baseInfo/xls/permission',
 				method: 'GET'
 			},
 			matchbytype: {

src/main/webapp/resources/js/index/services/DeputyOrder.js

@@ -10,7 +10,7 @@ define(['ngResource'], function() {
 				method: 'POST'
 			},
 			getOrderDetail: {
-				url: 'deputyOrder/getOrderDetail/:id/info',
+				url: 'deputyOrder/:id/info',
 				method: 'GET'
 			},
 			getProdList: {

src/main/webapp/resources/js/index/services/Fa.js

@@ -1,7 +1,7 @@
 define([ 'ngResource'], function() {
 	angular.module('FaServices', [ 'ngResource'
 	]).factory('FaApBill', ['$resource', function($resource) {
-		return $resource('sale/apBill/:id', {}, {
+		return $resource('sale/apBill/info/search', {}, {
 			getAll: {
 				url: 'sale/apBill/:id/info',
 				method: 'GET'
@@ -107,7 +107,7 @@ define([ 'ngResource'], function() {
 			}
 		});
 	}]).factory('FaApCheck', ['$resource', function($resource) {
-		return $resource('sale/apCheck/:id', {}, {
+		return $resource('sale/apCheck/info/search', {}, {
 			getItem: {
 				url: 'sale/apCheck/:id/info',
 				method: 'GET',

src/main/webapp/resources/js/index/services/Make.js

@@ -1,7 +1,7 @@
 define([ 'ngResource'], function() {
 	angular.module('MakeServices', [ 'ngResource'
 	]).factory('MakeOrder', ['$resource', function($resource) {
-		return $resource('make/orders/status', {}, {
+		return $resource('make/orders/info/search', {}, {
 			getItem: {
 				url: 'make/orders/:id/info',
 				method: 'GET'
@@ -22,14 +22,14 @@ define([ 'ngResource'], function() {
 				}
 			},	
 			getTodo: {
-				url: 'make/orders/status',
+				url: 'make/orders/info/search',
 				method: 'GET',
 				params: {
 					_state: 'todo'
 				}
 			},
 			getDone: {
-				url: 'make/orders/status',
+				url: 'make/orders/info/search',
 				method: 'GET',
 				params: {
 					_state: 'done'
@@ -40,7 +40,7 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			getEnd: {
-				url: 'make/orders/status',
+				url: 'make/orders/info/search',
 				method: 'GET',
 				params: {
 					_state: 'end'
@@ -60,7 +60,7 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: 'make/orders/permission/xls',
+				url: 'make/orders/xls/permission',
 				method: 'GET'
 			}
 		});
@@ -82,7 +82,7 @@ define([ 'ngResource'], function() {
 				method: 'GET',
 			},
 			exportXls: {
-				url: 'make/changes/permission/xls',
+				url: 'make/changes/xls/permission',
 				method: 'GET',
 			}
 		});
@@ -103,8 +103,12 @@ define([ 'ngResource'], function() {
 			}
 		});
 	}]).factory('MakeOutOrder', ['$resource',function($resource){
-		return $resource('make/outorders/:id', {}, {
+		return $resource('make/outorders/info/search', {}, {
 			getAll: {},
+			getItem: {
+				url: 'make/outorders/:id/info',
+				method: 'GET'
+			},
 			exportXls: {
 				url: 'make/outorders/xls/permission',
 				method: 'GET'

src/main/webapp/resources/js/index/services/Purc.js

@@ -34,6 +34,10 @@ define([ 'ngResource'], function() {
             custPrintCount: {
                 url: 'sale/orders/custPrintCount/:id',
                 method: 'POST'
+            },
+            custPrintPermission: {
+                url: 'sale/orders/custPrintCount/permission',
+                method: 'POST'
             }
 		});
 	}]).factory('PurcOrderItem', ['$resource', function($resource) {
@@ -105,7 +109,7 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: 'sale/orders/permission/xls',
+				url: 'sale/orders/xls/permission',
 				method: 'GET'
 			}
 		});
@@ -273,7 +277,7 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: 'sale/changes/permission/xls',
+				url: 'sale/changes/xls/permission',
 				method: 'GET'
 			}
 		});
@@ -338,7 +342,7 @@ define([ 'ngResource'], function() {
                     itemId: 'itemId'
                 }
             }, getItem: {
-                url: 'sale/inquiry/items/:itemId',
+                url: 'sale/inquiry/:itemId/info/mobile',
                 method: 'GET',
                 params: {
                     itemId: 'itemId'
@@ -375,7 +379,7 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			exportXls: {
-				url: 'sale/inquiry/permission/xls',
+				url: 'sale/inquiry/xls/permission',
 				method: 'GET'
 			}
         });
@@ -777,7 +781,7 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: 'sale/mould/permission/xls',
+				url: 'sale/mould/xls/permission',
 				method: 'GET'
 			}
 		});
@@ -880,7 +884,7 @@ define([ 'ngResource'], function() {
             }
         });
 	}]).factory('SaleSend', ['$resource', function($resource) {
-		return $resource('sale/notice/sends/:id', {}, {
+		return $resource('sale/notice/sends/info/search', {}, {
 			getItem: {
 				url: 'sale/notice/sends/:id/info',
 				method: 'GET'
@@ -1059,9 +1063,9 @@ define([ 'ngResource'], function() {
 			}
 		});
 	}]).factory('PurcApproval', ['$resource', function($resource) {
-		return $resource('sale/sample/approval/:id', {}, {
+		return $resource('sale/sample/approval/info/search', {}, {
 			getItem: {
-				url: 'sale/sample/approval/:id',
+				url: 'sale/sample/approval/:id/info',
 				method: 'GET'
 			},
 			getAgreed: {
@@ -1260,7 +1264,7 @@ define([ 'ngResource'], function() {
 				isArray: true
 			},
 			getVendor: {
-				url: 'vendor'
+				url: 'vendor/info/search'
 			},
             getServicer: {
                 url: 'vendor/servicer'
@@ -1372,14 +1376,14 @@ define([ 'ngResource'], function() {
 			},
 			getItem: {
 				isArray: false,
-				url: 'sale/quotation/item/:id'
+				url: 'sale/quotation/:id/info'
 			},
 			deleteById: {
 				url: 'sale/quotation/deleteById/:id',
 				method: 'DELETE'
 			},
 			exportXls: {
-				url: 'sale/quotation/permission/xls',
+				url: 'sale/quotation/xls/permission',
 				method: 'GET'
 			}
 		});
@@ -1594,7 +1598,7 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			detail: {
-				url: 'purc/inquiry/detail/:id',
+				url: 'purc/inquiry/:id/info',
 				method: 'GET'
 			},
 			submit: {
@@ -1615,7 +1619,7 @@ define([ 'ngResource'], function() {
 				isArray: true
 			},
 			submitUnapply: {
-				url: 'purc/inquiry/submit/:id',
+				url: 'purc/inquiry/submit/update',
 				method: 'POST'
 			},
 			saveAndSubmitWithoutVendor: {
@@ -1627,7 +1631,7 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			publishInquiry: {
-				url: 'purc/inquiry/pubishInquiry/:id',
+				url: 'purc/inquiry/submit/updatePublic',
 				method: 'POST'
 			},
 			publicInquiryItem: {