search各表对应查找方法

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@6478 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/search/SearchController.java

@@ -5,7 +5,27 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.uas.platform.b2b.model.MakeAccept;
+import com.uas.platform.b2b.model.MakeOrder;
+import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeReturn;
+import com.uas.platform.b2b.model.PurchaseAccept;
+import com.uas.platform.b2b.model.PurchaseApBill;
+import com.uas.platform.b2b.model.PurchaseBadIn;
+import com.uas.platform.b2b.model.PurchaseBadOut;
+import com.uas.platform.b2b.model.PurchaseForecastAll;
+import com.uas.platform.b2b.model.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseMRB;
+import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+import com.uas.platform.b2b.model.PurchaseProofing;
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import com.uas.platform.b2b.model.PurchaseProofingSend;
+import com.uas.platform.b2b.model.PurchaseReturn;
+import com.uas.platform.b2b.model.SaleARCheck;
+import com.uas.platform.b2b.model.SaleQuotation;
+import com.uas.platform.b2b.model.SaleSend;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 
@@ -22,6 +42,13 @@ public class SearchController {
 	@Autowired
 	private SearchService searchService;
 
+	/**
+	 * 客户采购单
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 */
 	@RequestMapping("/purchaseOrder")
 	@ResponseBody
 	public SPage<PurchaseOrder> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
@@ -29,5 +56,184 @@ public class SearchController {
 	}
 
 	// TODO hejq：其他表
+	/**
+	 * 客户采购验收单
+	 */
+	@RequestMapping("/purchaseAccept")
+	@ResponseBody
+	public SPage<PurchaseAccept> searchPurchaseAcceptIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseAcceptIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家应付发票表
+	 */
+	@RequestMapping("/purchaseApBill")
+	@ResponseBody
+	public SPage<PurchaseApBill> searchPurchaseApBillIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseApBillIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家不良品入库单
+	 */
+	@RequestMapping("/purchaseBadIn")
+	@ResponseBody
+	public SPage<PurchaseBadIn> searchPurchaseBadInIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseBadInIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家不良品出库单
+	 */
+	@RequestMapping("/purchaseBadOut")
+	@ResponseBody
+	public SPage<PurchaseBadOut> searchPurchaseBadOutIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseBadOutIds(keyword, pageParams);
+	}
+
+	/**
+	 * 采购预测单
+	 */
+	@RequestMapping("/purchaseForecastAll")
+	@ResponseBody
+	public SPage<PurchaseForecastAll> searchPurchaseForecastAllIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseForecastAllIds(keyword, pageParams);
+	}
+
+	/**
+	 * 采购询价单
+	 */
+	@RequestMapping("/purchaseInquiry")
+	@ResponseBody
+	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseInquiryIds(keyword, pageParams);
+	}
+
+	/**
+	 * 客户MRB
+	 */
+	@RequestMapping("/purchaseMRB")
+	@ResponseBody
+	public SPage<PurchaseMRB> searchPurchaseMRBIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseMRBIds(keyword, pageParams);
+	}
+
+	/**
+	 * 采购变更单
+	 */
+	@RequestMapping("/purchaseOrderChange")
+	@ResponseBody
+	public SPage<PurchaseOrderChange> searchPurchaseOrderChangeIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
+	}
+
+	/**
+	 * 客户打样申请单
+	 */
+	@RequestMapping("/purchaseProofing")
+	@ResponseBody
+	public SPage<PurchaseProofing> searchPurchaseProofingIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseProofingIds(keyword, pageParams);
+	}
+
+	/**
+	 * 采购验退单
+	 */
+	@RequestMapping("/purchaseReturn")
+	@ResponseBody
+	public SPage<PurchaseReturn> searchPurchaseReturnIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseReturnIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家委外验收单
+	 */
+	@RequestMapping("/makeAccept")
+	@ResponseBody
+	public SPage<MakeAccept> searchMakeAcceptIds(String keyword, PageParams pageParams) {
+		return searchService.searchMakeAcceptIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家委外加工单
+	 */
+	@RequestMapping("/makeOrder")
+	@ResponseBody
+	public SPage<MakeOrder> searchMakeOrderIds(String keyword, PageParams pageParams) {
+		return searchService.searchMakeOrderIds(keyword, pageParams);
+	}
+
+	/**
+	 * 委外变更单
+	 */
+	@RequestMapping("/makeOrderChange")
+	@ResponseBody
+	public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
+		return searchService.searchMakeOrderChangeIds(keyword, pageParams);
+	}
+
+	/**
+	 * 委外验退单
+	 */
+	@RequestMapping("/makeReturn")
+	@ResponseBody
+	public SPage<MakeReturn> searchMakeReturnIds(String keyword, PageParams pageParams) {
+		return searchService.searchMakeReturnIds(keyword, pageParams);
+	}
+
+	/**
+	 * 主动报价单
+	 */
+	@RequestMapping("/saleQuotation")
+	@ResponseBody
+	public SPage<SaleQuotation> searchSaleQuotationIds(String keyword, PageParams pageParams) {
+		return searchService.searchSaleQuotationIds(keyword, pageParams);
+	}
+
+	/**
+	 * 平台发货单
+	 */
+	@RequestMapping("/saleSend")
+	@ResponseBody
+	public SPage<SaleSend> searchSaleSendIds(String keyword, PageParams pageParams) {
+		return searchService.searchSaleSendIds(keyword, pageParams);
+	}
+
+	/**
+	 * 平台发货提醒单
+	 */
+	@RequestMapping("/purchaseNotice")
+	@ResponseBody
+	public SPage<PurchaseNotice> searchPurchaseNoticeIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
+	}
+
+	/**
+	 * 客户收到供应商的送样后的认定单： purc$proofingapproval
+	 */
+	@RequestMapping("/purchaseProofingApproval")
+	@ResponseBody
+	public SPage<PurchaseProofingApproval> searchPurchaseProofingApprovalIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
+	}
+
+	/**
+	 * 针对客户的打样申请单： purc$proofingsend
+	 */
+	@RequestMapping("/purchaseProofingSend")
+	@ResponseBody
+	public SPage<PurchaseProofingSend> searchPurchaseProofingSendIds(String keyword, PageParams pageParams) {
+		return searchService.searchPurchaseProofingSendIds(keyword, pageParams);
+	}
+
+	/**
+	 * 应付对账单： sale$archeck
+	 */
+	@RequestMapping("/saleARCheck")
+	@ResponseBody
+	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams) {
+		return searchService.searchSaleARCheckIds(keyword, pageParams);
+	}
 
 }

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.search;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseBadIn;
@@ -10,9 +11,16 @@ import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseMRB;
+import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseProofing;
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.model.PurchaseReturn;
+import com.uas.platform.b2b.model.SaleARCheck;
+import com.uas.platform.b2b.model.SaleQuotation;
+import com.uas.platform.b2b.model.SaleSend;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 
@@ -55,7 +63,7 @@ public interface SearchService {
 	/**
 	 * 不良品入库单
 	 */
-	public SPage<PurchaseBadIn> searchPuchaseBadInIds(String keyword, PageParams pageParams);
+	public SPage<PurchaseBadIn> searchPurchaseBadInIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 不良品出库单
@@ -100,8 +108,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	// public SPage<PurchaseChange> searchPurchaseChangeIds(String keyword,
-	// PageParams pageParams);
+	public SPage<PurchaseOrderChange> searchPurchaseOrderChangeIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 客户打样申请单
@@ -122,7 +129,7 @@ public interface SearchService {
 	public SPage<PurchaseReturn> searchPurchaseReturnIds(String keyword, PageParams pageParams);
 
 	/**
-	 * 委外验退单
+	 * 委外验收单
 	 * 
 	 * @param keyword
 	 * @param pageParams
@@ -138,4 +145,47 @@ public interface SearchService {
 	 * @return
 	 */
 	public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams);
-}
+
+	/**
+	 * 15.委外验退单
+	 * 
+	 */
+	public SPage<MakeReturn> searchMakeReturnIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 16.主动报价单搜索
+	 * 
+	 */
+	public SPage<SaleQuotation> searchSaleQuotationIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 17.平台发货单搜索
+	 * 
+	 */
+	public SPage<SaleSend> searchSaleSendIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 18.平台发货提醒单搜索
+	 * 
+	 */
+	public SPage<PurchaseNotice> searchPurchaseNoticeIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 19.客户收到供应商的送样后的认定单： purc$proofingapproval搜索
+	 * 
+	 */
+	public SPage<PurchaseProofingApproval> searchPurchaseProofingApprovalIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 20.针对客户的打样申请单： purc$proofingsend搜索
+	 * 
+	 */
+	public SPage<PurchaseProofingSend> searchPurchaseProofingSendIds(String keyword, PageParams pageParams);
+
+	/**
+	 * 21.应付对账单： sale$archeck搜索
+	 * 
+	 */
+	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams);
+
+}

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import com.uas.platform.b2b.dao.MakeAcceptDao;
 import com.uas.platform.b2b.dao.MakeOrderChangeDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
+import com.uas.platform.b2b.dao.MakeReturnDao;
 import com.uas.platform.b2b.dao.PurchaseAcceptDao;
 import com.uas.platform.b2b.dao.PurchaseApBillDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
@@ -15,12 +16,20 @@ import com.uas.platform.b2b.dao.PurchaseBadOutDao;
 import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 import com.uas.platform.b2b.dao.PurchaseMRBDao;
+import com.uas.platform.b2b.dao.PurchaseNoticeDao;
+import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDao;
+import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
 import com.uas.platform.b2b.dao.PurchaseProofingDao;
+import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
 import com.uas.platform.b2b.dao.PurchaseReturnDao;
+import com.uas.platform.b2b.dao.SaleARCheckDao;
+import com.uas.platform.b2b.dao.SaleQuotationDao;
+import com.uas.platform.b2b.dao.SaleSendDao;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.PurchaseBadIn;
@@ -28,9 +37,16 @@ import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseMRB;
+import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseProofing;
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.model.PurchaseReturn;
+import com.uas.platform.b2b.model.SaleARCheck;
+import com.uas.platform.b2b.model.SaleQuotation;
+import com.uas.platform.b2b.model.SaleSend;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.service.SearchService.Table_name;
@@ -74,6 +90,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseMRBDao purchaseMRBDao;
 
+	@Autowired
+	private PurchaseOrderChangeDao purchaseOrderChangeDao;
+
 	@Autowired
 	private PurchaseProofingDao purchaseProofingDao;
 
@@ -86,6 +105,27 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private MakeOrderChangeDao makeOrderChangeDao;
 
+	@Autowired
+	private MakeReturnDao makeReturnDao;
+
+	@Autowired
+	private SaleQuotationDao saleQuotationDao;
+
+	@Autowired
+	private SaleSendDao saleSendDao;
+
+	@Autowired
+	private PurchaseNoticeDao purchaseNoticeDao;
+
+	@Autowired
+	private PurchaseProofingApprovalDao purchaseProofingApprovalDao;
+
+	@Autowired
+	private PurchaseProofingSendDao purchaseProofingSendDao;
+
+	@Autowired
+	private SaleARCheckDao saleARCheckDao;
+
 	/**
 	 * 采购订单
 	 */
@@ -155,7 +195,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * @return
 	 */
 	@Override
-	public SPage<PurchaseBadIn> searchPuchaseBadInIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseBadIn> searchPurchaseBadInIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$BADIN, pageParams);
 		return toSPage(idsPage, purchaseBadInDao.findAll(idsPage.getContent()));
 	}
@@ -196,6 +236,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, purchaseMRBDao.findAll(idsPage.getContent()));
 	}
 
+	/**
+	 * 采购变更单
+	 */
+	@Override
+	public SPage<PurchaseOrderChange> searchPurchaseOrderChangeIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$PROOFING, pageParams);
+		return toSPage(idsPage, purchaseOrderChangeDao.findAll(idsPage.getContent()));
+	}
+
 	/**
 	 * 打样申请单
 	 */
@@ -214,16 +263,85 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, purchaseReturnDao.findAll(idsPage.getContent()));
 	}
 
+	/**
+	 * 委外验收单
+	 */
 	@Override
 	public SPage<MakeAccept> searchMakeAcceptIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$RETURN, pageParams);
 		return toSPage(idsPage, makeAcceptDao.findAll(idsPage.getContent()));
 	}
 
+	/**
+	 * 委外变更单
+	 */
 	@Override
 	public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.MAKE$CHANGES, pageParams);
 		return toSPage(idsPage, makeOrderChangeDao.findAll(idsPage.getContent()));
 	}
 
+	/**
+	 * 委外验退单
+	 */
+	@Override
+	public SPage<MakeReturn> searchMakeReturnIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.MAKE$RETURN, pageParams);
+		return toSPage(idsPage, makeReturnDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 主动报价单
+	 */
+	@Override
+	public SPage<SaleQuotation> searchSaleQuotationIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$QUOTATION, pageParams);
+		return toSPage(idsPage, saleQuotationDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 平台发货单
+	 */
+	@Override
+	public SPage<SaleSend> searchSaleSendIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$SEND, pageParams);
+		return toSPage(idsPage, saleSendDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 平台发货提醒单
+	 */
+	@Override
+	public SPage<PurchaseNotice> searchPurchaseNoticeIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$NOTICE, pageParams);
+		return toSPage(idsPage, purchaseNoticeDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 客户收到供应商的送样后的认定单： purc$proofingapproval
+	 */
+	@Override
+	public SPage<PurchaseProofingApproval> searchPurchaseProofingApprovalIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$PROOFINGAPPROVAL, pageParams);
+		return toSPage(idsPage, purchaseProofingApprovalDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 针对客户的打样申请单： purc$proofingsend
+	 */
+	@Override
+	public SPage<PurchaseProofingSend> searchPurchaseProofingSendIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$PROOFINGSEND, pageParams);
+		return toSPage(idsPage, purchaseProofingSendDao.findAll(idsPage.getContent()));
+	}
+
+	/**
+	 * 应付对账单： sale$archeck
+	 */
+	@Override
+	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams) {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$ARCHECK, pageParams);
+		return toSPage(idsPage, saleARCheckDao.findAll(idsPage.getContent()));
+	}
+
 }