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

src/main/java/com/uas/platform/b2b/erp/model/AcceptNotify.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.SaleSend;
+
 /**
  * 买家ERP的收料通知单
  */
@@ -50,5 +52,13 @@ public class AcceptNotify {
 	public void setAn_buyeruu(long an_buyeruu) {
 		this.an_buyeruu = an_buyeruu;
 	}
+	
+	public AcceptNotify() {
+		
+	}
+	
+	public AcceptNotify(SaleSend send) {
+		
+	}
 
 }

src/main/java/com/uas/platform/b2b/erp/model/PurchaseNotify.java

@@ -2,6 +2,11 @@ package com.uas.platform.b2b.erp.model;
 
 import java.util.Date;
 
+import com.uas.platform.b2b.model.PurchaseNotice;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.support.SystemSession;
+
 /**
  * 买家ERP系统的送货提醒单（提醒卖家发货）
  * 
@@ -74,4 +79,26 @@ public class PurchaseNotify {
 		this.pn_endqty = pn_endqty;
 	}
 
+	/**
+	 * 转为平台的客户送货提醒
+	 * 
+	 * @return
+	 */
+	public PurchaseNotice convert() {
+		PurchaseNotice notice = new PurchaseNotice();
+		notice.setDate(pn_indate);
+		notice.setDelivery(pn_delivery);
+		notice.setEndQty(pn_endqty);
+		notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		notice.setQty(pn_qty);
+		notice.setRemark(pn_remark);
+		PurchaseOrder order = new PurchaseOrder();
+		order.setCode(pn_ordercode);
+		PurchaseOrderItem orderItem = new PurchaseOrderItem();
+		orderItem.setNumber(pn_orderdetno);
+		orderItem.setOrder(order);
+		notice.setOrderItem(orderItem);
+		return notice;
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -1,27 +1,45 @@
 package com.uas.platform.b2b.erp.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.erp.model.AcceptNotify;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.erp.service.PurchaseNotifyService;
 import com.uas.platform.b2b.model.PurchaseNotice;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.SaleSend;
 
 @Service
-public class PurchaseNotifyServiceImpl implements PurchaseNotifyService{
+public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
+
+	@Autowired
+	private PurchaseOrderItemDao purchaseOrderItemDao;
 
 	@Override
 	public List<PurchaseNotice> convertPurchaseNotify(List<PurchaseNotify> notifies) {
-		// TODO
-		return null;
+		List<PurchaseNotice> notices = new ArrayList<PurchaseNotice>();
+		for (PurchaseNotify notify : notifies) {
+			PurchaseNotice notice = notify.convert();
+			List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(notice.getEnUU(), notice
+					.getOrderItem().getOrder().getCode(), notice.getOrderItem().getNumber());
+			if (!CollectionUtils.isEmpty(orderItems)) {
+				notice.setOrderItem(orderItems.get(0));
+				notices.add(notice);
+			}
+		}
+		return notices;
 	}
 
 	@Override
 	public List<AcceptNotify> convertSaleSend(List<SaleSend> sends) {
 		// TODO
+		
 		return null;
 	}
 
@@ -30,5 +48,5 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService{
 		// TODO
 		return null;
 	}
-	
+
 }

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

@@ -39,7 +39,7 @@ public class PurchaseInquiryItem {
 	/**
 	 * 来源（买家ERP采购询价明细）的ID
 	 */
-	@Column(name = "id_sourceid", insertable = false, updatable = false)
+	@Column(name = "id_sourceid", updatable = false)
 	private Long sourceId;
 
 	/**

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

@@ -1,12 +1,16 @@
 package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
+import java.util.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.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -36,6 +40,43 @@ public class PurchaseNotice implements Serializable {
 	@Column(name = "pn_enuu")
 	private Long enUU;
 
+	/**
+	 * 录入日期
+	 */
+	@Column(name = "pn_date")
+	private Date date;
+
+	/**
+	 * 数量
+	 */
+	@Column(name = "pn_qty")
+	private Double qty;
+
+	/**
+	 * 已发货数
+	 */
+	@Column(name = "pn_endqty")
+	private Double endQty;
+
+	/**
+	 * 交货日期
+	 */
+	@Column(name = "pn_delivery")
+	private Date delivery;
+
+	/**
+	 * 备注
+	 */
+	@Column(name = "pn_remark")
+	private String remark;
+
+	/**
+	 * 客户采购单明细
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH })
+	@JoinColumn(name = "pn_pdid", insertable = false, updatable = false, nullable = false)
+	private PurchaseOrderItem orderItem;
+
 	public Long getId() {
 		return id;
 	}
@@ -52,4 +93,52 @@ public class PurchaseNotice implements Serializable {
 		this.enUU = enUU;
 	}
 
+	public Double getQty() {
+		return qty;
+	}
+
+	public void setQty(Double qty) {
+		this.qty = qty;
+	}
+
+	public Double getEndQty() {
+		return endQty;
+	}
+
+	public void setEndQty(Double endQty) {
+		this.endQty = endQty;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public Date getDelivery() {
+		return delivery;
+	}
+
+	public void setDelivery(Date delivery) {
+		this.delivery = delivery;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public PurchaseOrderItem getOrderItem() {
+		return orderItem;
+	}
+
+	public void setOrderItem(PurchaseOrderItem orderItem) {
+		this.orderItem = orderItem;
+	}
+
 }