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

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

@@ -0,0 +1,76 @@
+package com.uas.platform.b2b.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.model.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.service.PurchaseInquiryService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+
+/**
+ * 卖家对询价单的操作
+ * 
+ * @author yingp
+ * 
+ */
+@Controller
+@RequestMapping("/sale/inquiry")
+public class SaleInquiryController {
+
+	@Autowired
+	private PurchaseInquiryService purchaseInquiryService;
+
+	/**
+	 * 作为卖家，收到的采购询价
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public Page<PurchaseInquiryItem> getReceivedPurchaseOrders(PageParams params) {
+		PageInfo info = new PageInfo(params);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		return purchaseInquiryService.findAllByPageInfo(info);
+	}
+
+	/**
+	 * 作为卖家，根据询价单ID查找询价单(含明细)
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@ResponseBody
+	public PurchaseInquiry getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
+		return purchaseInquiryService.findById(id);
+	}
+
+	/**
+	 * 作为卖家，给询价单报价
+	 * 
+	 * @param json
+	 * @param orderItemId
+	 * @return
+	 */
+	@RequestMapping(value = "/items/{inquiryItemId}/reply", method = RequestMethod.POST)
+	public ResponseEntity<String> replyOrderItem(@RequestBody String json, @PathVariable("inquiryItemId") Long inquiryItemId) {
+		PurchaseInquiryItem item = FlexJsonUtils.fromJson(json, PurchaseInquiryItem.class);
+
+		return new ResponseEntity<String>(HttpStatus.OK);
+	}
+
+}

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryService.java

@@ -2,9 +2,13 @@ package com.uas.platform.b2b.service;
 
 import java.util.List;
 
+import org.springframework.data.domain.Page;
+
 import com.uas.platform.b2b.erp.model.QuotationDown;
+import com.uas.platform.b2b.model.PurchaseInquiry;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
+import com.uas.platform.core.model.PageInfo;
 
 public interface PurchaseInquiryService {
 
@@ -17,6 +21,22 @@ public interface PurchaseInquiryService {
 	 */
 	public void save(List<PurchaseInquiryReply> inquiryReplies);
 
+	/**
+	 * 分页查找询价单
+	 * 
+	 * @param pageInfo
+	 * @return
+	 */
+	public Page<PurchaseInquiryItem> findAllByPageInfo(PageInfo pageInfo);
+	
+	/**
+	 * 用询价单ID查找询价单
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public PurchaseInquiry findById(Long id);
+
 	/**
 	 * 查找所有待上传到买家ERP的报价信息
 	 * 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -4,9 +4,17 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
+import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
 import com.uas.platform.b2b.erp.model.QuotationDown;
@@ -16,6 +24,7 @@ import com.uas.platform.b2b.model.PurchaseInquiryReply;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
+import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 
 @Service
@@ -27,6 +36,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Autowired
 	private PurchaseInquiryItemDao purchaseInquiryItemDao;
 
+	@Autowired
+	private PurchaseInquiryDao purchaseInquiryDao;
+
 	@Override
 	public void save(List<PurchaseInquiryReply> inquiryReplies) {
 		purchaseInquiryReplyDao.save(inquiryReplies);
@@ -127,4 +139,20 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
 	}
 
+	@Override
+	public Page<PurchaseInquiryItem> findAllByPageInfo(final PageInfo pageInfo) {
+		return purchaseInquiryItemDao.findAll(new Specification<PurchaseInquiryItem>() {
+
+			public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				query.where(pageInfo.getPredicates(root, builder));
+				return null;
+			}
+		}, pageInfo);
+	}
+
+	@Override
+	public PurchaseInquiry findById(Long id) {
+		return purchaseInquiryDao.findOne(id);
+	}
+
 }

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

@@ -410,7 +410,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			page : 1, 
 			count : 5,
 			sorting: {
-                date: 'desc'
+                'inquiry.date': 'desc'
             },
             filter: {
             	'status' : 200