客户采购询价已收货bug修复

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

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

@@ -5,10 +5,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-/** 
-  * @author yujia 
-  * @version 创建时间：2015年12月29日 下午1:48:26 
-  * 程序的简单说明 
+/**
+  * @author wangmh
+  * @version 创建时间：2017年6月23日
+  * 程序的简单说明
   */
 @Repository
 public interface PurchaseOrderReceivedDao extends JpaSpecificationExecutor<PurchaseOrderReceived> , JpaRepository<PurchaseOrderReceived, Long>{

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

@@ -7,9 +7,9 @@ import java.util.Date;
 import java.util.Set;
 
 /** 
-  * @author yujia 
-  * @version 创建时间：2015年12月29日 上午11:25:19 
-  * 待交货的采购订单
+  * @author wangmh
+  * @version 创建时间：2017年6月23日
+  * 已交货的采购订单
   */
 
 @Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date") })
@@ -143,7 +143,7 @@ public class PurchaseOrderReceived {
 	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@OrderBy("number")
 	@Where(clause = "nvl(pd_acceptqty,0)<nvl(pd_qty,0)+nvl(pd_returnqty,0)")
-	private Set<PurchaseOrderWaitingItem> orderItems;
+	private Set<PurchaseOrderReceivedItem> orderItems;
 	
 	/**
 	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
@@ -322,11 +322,11 @@ public class PurchaseOrderReceived {
 		this.sendStatus = sendStatus;
 	}
 
-	public Set<PurchaseOrderWaitingItem> getOrderItems() {
+	public Set<PurchaseOrderReceivedItem> getOrderItems() {
 		return orderItems;
 	}
 
-	public void setOrderItems(Set<PurchaseOrderWaitingItem> orderItems) {
+	public void setOrderItems(Set<PurchaseOrderReceivedItem> orderItems) {
 		this.orderItems = orderItems;
 	}
 

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

@@ -26,7 +26,7 @@ public class PurchaseOrderReceivedItem {
 	 */
 	@ManyToOne(cascade = CascadeType.ALL, optional = true)
 	@JoinColumn(name = "pd_puid", nullable = false)
-	private PurchaseOrderWaiting order;
+	private PurchaseOrderReceived order;
 
 	/**
 	 * 产品ID
@@ -191,11 +191,11 @@ public class PurchaseOrderReceivedItem {
 
 	@JsonIgnore
 	@JSONField(serialize = false)
-	public PurchaseOrderWaiting getOrder() {
+	public PurchaseOrderReceived getOrder() {
 		return order;
 	}
 
-	public void setOrder(PurchaseOrderWaiting order) {
+	public void setOrder(PurchaseOrderReceived order) {
 		this.order = order;
 	}
 

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

@@ -58,7 +58,7 @@ public interface SearchService {
 	public SPage<PurchaseOrderEnd> searchaPurchaseEndOrderIds(String keyword, PageParams pageParams);
 
 	/**
-	 * 采购订单（待回复）
+	 * 采购订单（待收货）
 	 * 
 	 * @param keyword
 	 * @param pageParams