采购单明细增加附件上传

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

@@ -4,8 +4,12 @@ import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurcOrderInfoItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * ERP系统的采购订单明细
@@ -26,6 +30,7 @@ public class PurchaseDetail {
 	private String pd_factory;
 	private String pd_vendspec;
 	private Integer pd_beipin;
+	private List<Attach> attaches;
 
 	public String getPd_vendspec() {
 		return pd_vendspec;
@@ -115,7 +120,15 @@ public class PurchaseDetail {
 		this.pd_beipin = pd_beipin;
 	}
 
-	/**
+    public List<Attach> getAttaches() {
+        return attaches;
+    }
+
+    public void setAttaches(List<Attach> attaches) {
+        this.attaches = attaches;
+    }
+
+    /**
 	 * 转为平台的采购订单明细
 	 * 
 	 * @return
@@ -136,6 +149,14 @@ public class PurchaseDetail {
 		product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		item.setProduct(product);
 		item.setBeipin(this.pd_beipin);
+		if (!CollectionUtils.isEmpty(this.attaches)) {
+			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();
+			for(Attach attach : this.attaches) {
+				com.uas.platform.b2b.model.Attach b2bAttach = attach.convertToB2bAttach("客户采购订单明细物料附件");
+				b2bAttaches.add(b2bAttach);
+			}
+			item.setAttachs(b2bAttaches);
+		}
 		return item;
 	}
 

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

@@ -6,18 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-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.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -58,6 +47,13 @@ public class PurcOrderInfoItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */
@@ -225,6 +221,14 @@ public class PurcOrderInfoItem {
 		this.product = product;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+
 	public Double getQty() {
 		return qty;
 	}

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

@@ -6,18 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-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.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import com.uas.platform.b2b.core.util.StringUtil;
 import org.apache.axis.utils.StringUtils;
@@ -64,6 +53,13 @@ public class PurchaseOrderAllItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */
@@ -242,6 +238,14 @@ public class PurchaseOrderAllItem {
 		this.product = product;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+
 	public Double getQty() {
 		return qty;
 	}

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

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
 import java.util.Date;
+import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Where;
@@ -52,6 +45,13 @@ public class PurchaseOrderDoneItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */

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

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
 import java.util.Date;
+import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
@@ -50,6 +43,13 @@ public class PurchaseOrderEndItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */
@@ -198,6 +198,14 @@ public class PurchaseOrderEndItem {
 		this.product = product;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+
 	@JsonIgnore
 	@JSONField(serialize = false)
 	public PurchaseOrderEnd getOrder() {

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

@@ -6,14 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.OptimisticLockType;
@@ -61,6 +54,13 @@ public class PurchaseOrderItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */
@@ -218,6 +218,14 @@ public class PurchaseOrderItem {
 		this.product = product;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+
 	public Double getQty() {
 		return qty;
 	}

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

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
 import java.util.Date;
+import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
@@ -50,6 +43,13 @@ public class PurchaseOrderTodoItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */
@@ -202,6 +202,14 @@ public class PurchaseOrderTodoItem {
 		this.product = product;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+
 	public Double getQty() {
 		return qty;
 	}

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

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
 import java.util.Date;
+import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 
@@ -51,6 +44,13 @@ public class PurchaseOrderWaitingItem {
 	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
 	private Product product;
 
+	/**
+	 * 产品的附件
+	 */
+	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+	@JoinTable(name = "purc$prod$attach", joinColumns = @JoinColumn(name = "pd_id", referencedColumnName = "pd_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
+	private Set<Attach> attachs;
+
 	/**
 	 * 数量
 	 */
@@ -199,6 +199,14 @@ public class PurchaseOrderWaitingItem {
 		this.product = product;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+
 	@JsonIgnore
 	@JSONField(serialize = false)
 	public PurchaseOrderWaiting getOrder() {

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

@@ -375,10 +375,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public PurchaseOrderAll findById(Long id) {
-		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findById(id);
-		if (purchaseOrderAlls.size() == 0)
+		PurchaseOrderAll purchaseOrderAll = purchaseOrderAllDao.findOne(id);
+		if (purchaseOrderAll == null) {
 			throw new NotFoundException();
-		return purchaseOrderAlls.get(0);
+		}
+		return purchaseOrderAll;
 	}
 
 	@Override