【搜索服务】 搜索详情还原为搜索主表

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

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

@@ -15,7 +15,7 @@ import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
+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.PurchaseOrderAll;
@@ -107,7 +107,7 @@ public class SearchController {
 	 */
 	@RequestMapping("/purchaseInquiry")
 	@ResponseBody
-	public SPage<PurchaseInquiryItem> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
 		return searchService.searchPurchaseInquiryIds(keyword, pageParams);
 	}
 

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

@@ -13,7 +13,7 @@ import com.uas.platform.b2b.model.PurchaseApCheckTodo;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
+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.PurchaseOrderAll;
@@ -134,7 +134,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<PurchaseInquiryItem> searchPurchaseInquiryIds(String keyword, PageParams pageParams);
+	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 客户MRB
@@ -233,7 +233,7 @@ public interface SearchService {
 	public SPage<SaleARCheck> searchSaleARCheckIds(String keyword, PageParams pageParams);
 
 	/**
-
+	 * 
 	 * 应收对帐单
 	 * 
 	 * @param keyword
@@ -280,7 +280,4 @@ public interface SearchService {
 	public com.uas.search.b2b.model.PageParams convertPageParams(com.uas.platform.core.model.PageParams params,
 			String searchFilter);
 
-
-
-
 }

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

@@ -22,7 +22,7 @@ import com.uas.platform.b2b.dao.PurchaseApCheckTodoDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
 import com.uas.platform.b2b.dao.PurchaseBadOutDao;
 import com.uas.platform.b2b.dao.PurchaseForecastAllItemDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+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.PurchaseOrderAllDao;
@@ -37,6 +37,7 @@ 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.SaleQuotationItemDao;
 import com.uas.platform.b2b.dao.SaleSendAllDao;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeOrder;
@@ -51,7 +52,7 @@ import com.uas.platform.b2b.model.PurchaseApCheckTodo;
 import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseBadOut;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
+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.PurchaseOrderAll;
@@ -109,7 +110,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private PurchaseForecastAllItemDao purchaseForecastItemDao;
 
 	@Autowired
-	private PurchaseInquiryItemDao purchaseInquiryItemDao;
+	private PurchaseInquiryDao purchaseInquiryDao;
 
 	@Autowired
 	private PurchaseMRBDao purchaseMRBDao;
@@ -171,6 +172,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private PurchaseApCheckEndDao purchaseApCheckEndDao;
 
+	@Autowired
+	private SaleQuotationItemDao saleQuotatioItemDao;
+
 	/**
 	 * 采购订单
 	 */
@@ -267,9 +271,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * 采购询价单
 	 */
 	@Override
-	public SPage<PurchaseInquiryItem> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
+	public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$INQUIRY, pageParams);
-		return toSPage(idsPage, purchaseInquiryItemDao.findAll(idsPage.getContent()));
+		return toSPage(idsPage, purchaseInquiryDao.findAll(idsPage.getContent()));
 	}
 
 	/**