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

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

@@ -58,6 +58,12 @@ public class PurchaseOrderAllItem {
 	@Column(name = "pd_replyqty")
 	private Double replyQty;
 
+	/**
+	 * 回复的交期
+	 */
+	@Column(name = "pd_replydelivery")
+	private Date replyDelivery;
+
 	/**
 	 * 备注
 	 */
@@ -75,8 +81,8 @@ public class PurchaseOrderAllItem {
 	 */
 	@Column(name = "pd_taxrate")
 	private Float taxrate;
-	
-	@Column(name="pd_status")
+
+	@Column(name = "pd_status")
 	private Short status;
 
 	/**
@@ -102,7 +108,7 @@ public class PurchaseOrderAllItem {
 	 */
 	@Column(name = "pd_delivery")
 	private Date delivery;
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -207,6 +213,14 @@ public class PurchaseOrderAllItem {
 		this.delivery = delivery;
 	}
 
+	public Date getReplyDelivery() {
+		return replyDelivery;
+	}
+
+	public void setReplyDelivery(Date replyDelivery) {
+		this.replyDelivery = replyDelivery;
+	}
+
 	public Short getStatus() {
 		return status;
 	}

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

@@ -57,6 +57,12 @@ public class PurchaseOrderItem {
 	@Column(name = "pd_replyqty")
 	private Double replyQty;
 	
+	/**
+	 * 回复的交期
+	 */
+	@Column(name = "pd_replydelivery")
+	private Date replyDelivery;
+	
 	/**
 	 * 备注
 	 */
@@ -217,6 +223,14 @@ public class PurchaseOrderItem {
 		this.delivery = delivery;
 	}
 
+	public Date getReplyDelivery() {
+		return replyDelivery;
+	}
+
+	public void setReplyDelivery(Date replyDelivery) {
+		this.replyDelivery = replyDelivery;
+	}
+
 	public Short getStatus() {
 		return status;
 	}

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

@@ -79,6 +79,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		Double replyQty = item.getReplyQty();
 		replyQty = replyQty == null ? 0 : replyQty;
 		item.setReplyQty(replyQty + reply.getQty());
+		item.setReplyDelivery(reply.getDelivery());
 		if (item.getReplyQty() > item.getQty())
 			throw new IllegalOperatorException("回复的数量合计超过了订单数量");
 		// 该行回复状态