改变附件数据结构

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

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

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.controller;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -75,15 +77,29 @@ public class SaleSampleController {
 	public ResponseEntity<String> sendSample(String json, @PathVariable("id") Long id, FileUpload uploadItem) {
 		PurchaseProofingSend proofingSend = FlexJsonUtils.fromJson(json, PurchaseProofingSend.class);
 		PurchaseProofingItem proofingItem = new PurchaseProofingItem();
-		if(uploadItem != null && uploadItem.getFile() != null) {
-			Attach attach = attachService.uploadAndSave(uploadItem, "purchaseProofing", "送样单附件");
-			proofingSend.setAttach(attach.getId().toString());
-		}
 		proofingItem.setId(id);
 		proofingSend.setProofingItem(proofingItem);
 		proofingSend.setItemId(id);
-		purchaseProofingService.send(proofingSend);
+		proofingSend = purchaseProofingService.send(proofingSend);
+		if(uploadItem != null && uploadItem.getFile() != null && proofingSend != null) {
+			Attach attach = attachService.uploadAndSave(uploadItem, "purchaseProofing", "送样单附件");
+			attach.setRelativeTable("purc$proofingsend");
+			attach.setRelativeKey(proofingSend.getId());
+			attachService.save(attach);
+		}
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
+	/**
+	 * 作为卖家，获取送样申请明细的送样单
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}/send", method = RequestMethod.GET)
+	@ResponseBody
+	public List<PurchaseProofingSend> getProofingSends(@PathVariable("id") Long id) {
+		return purchaseProofingService.findSendsByItemId(id);
+	}
+
 }

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

@@ -28,4 +28,6 @@ public interface PurchaseProofingSendDao extends JpaSpecificationExecutor<Purcha
 	public List<PurchaseProofingSend> findBySendStatusAndProofingItemProofingEnUU(Short sendStatus, Long enUU);
 	
 	public List<PurchaseProofingSend> findByProofingItemVendUUAndCode(Long vendUU, String code);
+	
+	public List<PurchaseProofingSend> findByProofingItemId(Long id);
 }

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

@@ -252,7 +252,6 @@ public class SaleSampleSend {
 		PurchaseProofingSend proofingSend = new PurchaseProofingSend();
 		proofingSend.setAddressMark(ss_addressmark);
 		proofingSend.setAdress(ss_address);
-		proofingSend.setAttach(ss_attach);
 		proofingSend.setBackStatus((short) Status.DOWNLOADED.value());//传输到卖家ERP的状态为已上传
 		proofingSend.setBrand(ss_brand);
 		proofingSend.setCode(ss_code);

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

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.model;
 
+import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -54,6 +56,12 @@ public class Attach {
 	@Column(name = "rel_key")
 	private Long relativeKey;
 
+	/**
+	 * 保存时间
+	 */
+	@Column(name = "at_date")
+	private Date date;
+
 	@Transient
 	private String sourceId;
 
@@ -64,6 +72,15 @@ public class Attach {
 	public void setId(Long id) {
 		this.id = id;
 	}
+	
+	@JsonIgnore
+	public Date getDate() {
+		return date;
+	}
+	
+	public void setDate(Date date) {
+		this.date = date;
+	}
 
 	@JsonIgnore
 	public String getPath() {
@@ -145,5 +162,21 @@ public class Attach {
 		this.description = description;
 		this.size = size;
 	}
+	
+	/**
+	 * 
+	 * @param fileName
+	 * @param filePath
+	 * @param description
+	 * @param size
+	 * @param date
+	 */
+	public Attach(String fileName, String filePath, String description, long size, Date date) {
+		this.name = fileName;
+		this.path = filePath;
+		this.description = description;
+		this.size = size;
+		this.date = date;
+	}
 
 }

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

@@ -19,6 +19,7 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.Where;
 
 /**
  * 平台里面，以供应商的角度来查看采购询价单
@@ -110,11 +111,12 @@ public class PurchaseInquiry implements Serializable {
 	private Long sourceId;
 
 	/**
-	 * 附件ID
+	 * 附件
 	 */
-	@Column(name = "in_attach")
-	private String attach;
-
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$inquiry'")
+	private Set<Attach> attachs;
+	
 	public Long getId() {
 		return id;
 	}
@@ -203,14 +205,6 @@ public class PurchaseInquiry implements Serializable {
 		this.sourceId = sourceId;
 	}
 
-	public String getAttach() {
-		return attach;
-	}
-
-	public void setAttach(String attach) {
-		this.attach = attach;
-	}
-
 	@JsonIgnore
 	public Set<PurchaseInquiryItem> getInquiryItems() {
 		return inquiryItems;
@@ -220,4 +214,13 @@ public class PurchaseInquiry implements Serializable {
 		this.inquiryItems = inquiryItems;
 	}
 
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+	
+
 }

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

@@ -19,6 +19,7 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.Where;
 
 /**
  * 平台里面，以供应商的角度来查看客户打样申请
@@ -133,10 +134,11 @@ public class PurchaseProofing implements Serializable {
 	private Set<PurchaseProofingItem> proofingItems;
 
 	/**
-	 * 附件ID
+	 * 附件
 	 */
-	@Column(name = "pp_attach")
-	private String attach;
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$proofing'")
+	private Set<Attach> attachs;
 
 	public Long getId() {
 		return id;
@@ -267,13 +269,14 @@ public class PurchaseProofing implements Serializable {
 		this.proofingItems = proofingItems;
 	}
 
-	public String getAttach() {
-		return attach;
+	public Set<Attach> getAttachs() {
+		return attachs;
 	}
 
-	public void setAttach(String attach) {
-		this.attach = attach;
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
 	}
+	
 
 	
 

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

@@ -2,18 +2,23 @@ package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
 
 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.JoinColumn;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Where;
+
 /**
  * 平台里面，供应商针对客户打样申请的送样单
  * 
@@ -131,10 +136,11 @@ public class PurchaseProofingApproval implements Serializable {
 	@Column(name = "psa_remark")
 	private String remark;
 	/**
-	 * 样品附件
+	 * 附件
 	 */
-	@Column(name = "psa_attach")
-	private String attach;
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$proofingapproval'")
+	private Set<Attach> attachs;
 	/**
 	 * 收到样品时间 - 研发认定
 	 */
@@ -163,8 +169,9 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 附件 - 研发认定
 	 */
-	@Column(name = "psa_prdattach")
-	private String prdattach;
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$proofingapproval_prd'")
+	private Set<Attach> prdAttachs;
 	/**
 	 * 收到样品时间 - IQC认定
 	 */
@@ -193,8 +200,9 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 附件 - IQC认定
 	 */
-	@Column(name = "psa_padattach")
-	private String padattach;
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$proofingapproval_pad'")
+	private Set<Attach> padAttachs;
 	/**
 	 * 收到样品时间 - 工程认定
 	 */
@@ -223,8 +231,9 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 附件 - 工程认定
 	 */
-	@Column(name = "psa_ppdattach")
-	private String ppdattach;
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$proofingapproval_ppd'")
+	private Set<Attach> ppdAttachs;
 	/**
 	 * 认定结果
 	 */
@@ -360,12 +369,6 @@ public class PurchaseProofingApproval implements Serializable {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	public String getAttach() {
-		return attach;
-	}
-	public void setAttach(String attach) {
-		this.attach = attach;
-	}
 	public Date getPrdtime() {
 		return prdtime;
 	}
@@ -396,12 +399,6 @@ public class PurchaseProofingApproval implements Serializable {
 	public void setPrdremark(String prdremark) {
 		this.prdremark = prdremark;
 	}
-	public String getPrdattach() {
-		return prdattach;
-	}
-	public void setPrdattach(String prdattach) {
-		this.prdattach = prdattach;
-	}
 	public Date getPadtime() {
 		return padtime;
 	}
@@ -432,12 +429,6 @@ public class PurchaseProofingApproval implements Serializable {
 	public void setPadremark(String padremark) {
 		this.padremark = padremark;
 	}
-	public String getPadattach() {
-		return padattach;
-	}
-	public void setPadattach(String padattach) {
-		this.padattach = padattach;
-	}
 	public Date getPpdtime() {
 		return ppdtime;
 	}
@@ -468,12 +459,6 @@ public class PurchaseProofingApproval implements Serializable {
 	public void setPpdremark(String ppdremark) {
 		this.ppdremark = ppdremark;
 	}
-	public String getPpdattach() {
-		return ppdattach;
-	}
-	public void setPpdattach(String ppdattach) {
-		this.ppdattach = ppdattach;
-	}
 	public String getFinalresult() {
 		return finalresult;
 	}
@@ -492,6 +477,30 @@ public class PurchaseProofingApproval implements Serializable {
 	public void setSendStatus(Short sendStatus) {
 		this.sendStatus = sendStatus;
 	}
+	public Set<Attach> getAttachs() {
+		return attachs;
+	}
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
+	}
+	public Set<Attach> getPrdAttachs() {
+		return prdAttachs;
+	}
+	public void setPrdAttachs(Set<Attach> prdAttachs) {
+		this.prdAttachs = prdAttachs;
+	}
+	public Set<Attach> getPadAttachs() {
+		return padAttachs;
+	}
+	public void setPadAttachs(Set<Attach> padAttachs) {
+		this.padAttachs = padAttachs;
+	}
+	public Set<Attach> getPpdAttachs() {
+		return ppdAttachs;
+	}
+	public void setPpdAttachs(Set<Attach> ppdAttachs) {
+		this.ppdAttachs = ppdAttachs;
+	}
 	
 
 }

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

@@ -2,18 +2,24 @@ package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
 
 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.JoinColumn;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.Where;
+
 /**
  * 平台里面，供应商针对客户打样申请的送样单
  * 
@@ -147,8 +153,9 @@ public class PurchaseProofingSend implements Serializable {
 	/**
 	 * 附件
 	 */
-	@Column(name = "pps_attach")
-	private String attach;
+	@OneToMany(mappedBy = "relativeKey", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@Where(clause = "rel_table = 'purc$proofingsend'")
+	private Set<Attach> attachs;
 	
 	/**
 	 * 传输到买方ERP的状态
@@ -194,6 +201,7 @@ public class PurchaseProofingSend implements Serializable {
 		this.code = code;
 	}
 
+	@JsonIgnore
 	public PurchaseProofingItem getProofingItem() {
 		return proofingItem;
 	}
@@ -330,13 +338,14 @@ public class PurchaseProofingSend implements Serializable {
 		this.recorder = recorder;
 	}
 
-	public String getAttach() {
-		return attach;
+	public Set<Attach> getAttachs() {
+		return attachs;
 	}
 
-	public void setAttach(String attach) {
-		this.attach = attach;
+	public void setAttachs(Set<Attach> attachs) {
+		this.attachs = attachs;
 	}
 
 
+
 }