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

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

@@ -8,20 +8,45 @@ 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.SaleOrder;
-import com.uas.platform.b2b.service.SaleOrderService;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.service.PurchaseOrderService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 
 @Controller
 @RequestMapping("/sale")
 public class SaleOrderController {
-	
+
 	@Autowired
-	private SaleOrderService saleOrderService;
+	private PurchaseOrderService purchaseOrderService;
 
+	/**
+	 * 作为卖家，收到的采购订单
+	 * 
+	 * @param json
+	 * @return
+	 */
 	@RequestMapping(value = "/orders", method = RequestMethod.POST)
 	@ResponseBody
-	public Page<SaleOrder> getSaleOrders(@RequestBody String json) {
-		return saleOrderService.findAllByPageInfo(new PageInfo(json));
+	public Page<PurchaseOrder> getReceivedPurchaseOrders(@RequestBody String json) {
+		PageInfo info = new PageInfo(json);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		return purchaseOrderService.findAllByPageInfo(info);
+	}
+	
+	/**
+	 * 作为卖家，收到的采购订单(含明细)
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/orders/items", method = RequestMethod.POST)
+	@ResponseBody
+	public Page<PurchaseOrder> getReceivedPurchaseOrderItems(@RequestBody String json) {
+		PageInfo info = new PageInfo(json);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		return purchaseOrderService.findAllByPageInfo(info);
 	}
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderDao.java

@@ -0,0 +1,12 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.PurchaseOrder;
+
+@Repository
+public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder>, JpaRepository<PurchaseOrder, Long> {
+
+}

src/main/java/com/uas/platform/b2b/model/PurchaseOrder.java

@@ -4,17 +4,21 @@ import java.io.Serializable;
 import java.sql.Date;
 import java.util.List;
 
-import javax.persistence.CascadeType;
+//import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+//import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
+//import javax.persistence.OneToMany;
+//import javax.persistence.OrderBy;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
-@Entity(name = "purc$orders")
+@Table(name = "purc$orders")
+@Entity
 public class PurchaseOrder implements Serializable {
 
 	/**
@@ -109,8 +113,9 @@ public class PurchaseOrder implements Serializable {
 	/**
 	 * 采购单明细
 	 */
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "order")
-	@OrderBy("pd_number")
+//	@OneToMany(cascade = CascadeType.ALL, mappedBy = "order", fetch=FetchType.EAGER)
+//	@OrderBy("pd_number")
+	@Transient
 	private List<PurchaseOrderItem> orderItems;
 
 	public Long getId() {

src/main/java/com/uas/platform/b2b/model/PurchaseOrderItem.java

@@ -13,8 +13,10 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
-@Entity(name = "purc$orderitems")
+@Table(name = "purc$orderitems")
+@Entity
 public class PurchaseOrderItem implements Serializable {
 
 	/**

src/main/java/com/uas/platform/b2b/model/PurchaseReply.java

@@ -0,0 +1,118 @@
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+import java.sql.Date;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+/**
+ * 
+ * 采购订单回复记录
+ * 
+ * @author yingp
+ *
+ */
+@Table(name = "purc$reply")
+@Entity
+public class PurchaseReply implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$reply_gen")
+	@SequenceGenerator(name = "purc$reply_gen", sequenceName = "purc$reply_seq", allocationSize = 1)
+	@Column(name = "pr_id")
+	private Long id;
+
+	/**
+	 * 回复时日期
+	 */
+	@Column(name = "pr_date")
+	private Date date;
+
+	/**
+	 * 采购订单明细
+	 */
+	@ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
+	@JoinColumn(name = "pr_pdid")
+	private PurchaseOrderItem orderItem;
+
+	/**
+	 * 数量
+	 */
+	@Column(name = "pr_qty")
+	private Double qty;
+
+	/**
+	 * 备注
+	 */
+	@Column(name = "pr_remark")
+	private String remark;
+
+	/**
+	 * 交货日期
+	 */
+	@Column(name = "pr_delivery")
+	private Date delivery;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public PurchaseOrderItem getOrderItem() {
+		return orderItem;
+	}
+
+	public void setOrderItem(PurchaseOrderItem orderItem) {
+		this.orderItem = orderItem;
+	}
+
+	public Double getQty() {
+		return qty;
+	}
+
+	public void setQty(Double qty) {
+		this.qty = qty;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Date getDelivery() {
+		return delivery;
+	}
+
+	public void setDelivery(Date delivery) {
+		this.delivery = delivery;
+	}
+
+}

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

@@ -0,0 +1,9 @@
+package com.uas.platform.b2b.service;
+
+import com.uas.platform.b2b.model.Enterprise;
+
+public interface EnterpriseService {
+	
+	Enterprise findByUU(long uu);
+
+}

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

@@ -0,0 +1,14 @@
+package com.uas.platform.b2b.service;
+
+import org.springframework.data.domain.Page;
+
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.core.model.PageInfo;
+
+public interface PurchaseOrderService {
+
+	public Page<PurchaseOrder> findAllByPageInfo(PageInfo pageInfo);
+	
+	public Page<PurchaseOrder> findAllDetailByPageInfo(PageInfo pageInfo);
+
+}

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

@@ -0,0 +1,39 @@
+package com.uas.platform.b2b.service.impl;
+
+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.PurchaseOrderDao;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.service.PurchaseOrderService;
+import com.uas.platform.core.model.PageInfo;
+
+@Service
+public class PurchaseOrderServiceImpl implements PurchaseOrderService{
+
+	@Autowired
+	private PurchaseOrderDao purchaseOrderDao;
+	
+	public Page<PurchaseOrder> findAllByPageInfo(PageInfo pageInfo) {
+		return purchaseOrderDao.findAll(new Specification<PurchaseOrder>() {
+
+			public Predicate toPredicate(Root<PurchaseOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				return null;
+			}
+		}, pageInfo);
+	}
+
+	@Override
+	public Page<PurchaseOrder> findAllDetailByPageInfo(PageInfo pageInfo) {
+		
+		return null;
+	}
+
+}

src/main/java/com/uas/platform/b2b/support/CustomAuthenticationSuccessHandler.java

@@ -29,6 +29,7 @@ public class CustomAuthenticationSuccessHandler extends SimpleUrlAuthenticationS
 	public void onAuthenticationSuccess(final HttpServletRequest request, final HttpServletResponse response,
 			final Authentication authentication) throws ServletException, IOException {
 		User user = userService.findUserByUserUU(Long.parseLong(authentication.getName()));
+		user.setCurrentEnterprise();
 		request.getSession().setAttribute("user", user);
 
 		final SavedRequest savedRequest = requestCache.getRequest(request, response);