送样申请单和认定单附件信息传输到ERP

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

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.model;
 
 import java.util.Date;
+import java.util.List;
 
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 
@@ -51,6 +52,29 @@ public class SaleSampleApproval{
 	private String pa_ppdattach;
 	private String pa_finalresult;
 	private String pa_finalresultremark;
+	private List<RemoteFile> files;
+	private List<RemoteFile> prdfiles;
+	private List<RemoteFile> padfiles;
+	private List<RemoteFile> ppdfiles;
+	
+	public List<RemoteFile> getPrdfiles() {
+		return prdfiles;
+	}
+	public void setPrdfiles(List<RemoteFile> prdfiles) {
+		this.prdfiles = prdfiles;
+	}
+	public List<RemoteFile> getPadfiles() {
+		return padfiles;
+	}
+	public void setPadfiles(List<RemoteFile> padfiles) {
+		this.padfiles = padfiles;
+	}
+	public List<RemoteFile> getPpdfiles() {
+		return ppdfiles;
+	}
+	public void setPpdfiles(List<RemoteFile> ppdfiles) {
+		this.ppdfiles = ppdfiles;
+	}
 	public String getPa_code() {
 		return pa_code;
 	}
@@ -324,6 +348,12 @@ public class SaleSampleApproval{
 		this.pa_sampleqty = approval.getSampleqty();
 		this.pa_sscode = approval.getSscode();
 	}
+	public List<RemoteFile> getFiles() {
+		return files;
+	}
+	public void setFiles(List<RemoteFile> files) {
+		this.files = files;
+	}
 
 
 

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.model;
 
 import java.util.Date;
+import java.util.List;
 
 import com.uas.platform.b2b.model.PurchaseProofingItem;
 
@@ -34,6 +35,7 @@ public class SaleSampleDown {
 	private Double ps_qty;
 	private Double ps_total;
 	private String ps_remark;
+	private List<RemoteFile> files;
 	
 	public Long getB2b_ps_id() {
 		return b2b_ps_id;
@@ -235,4 +237,12 @@ public class SaleSampleDown {
 		this.ps_scope = proofingItem.getProofing().getScope();
 		this.ps_total = proofingItem.getAmount();
 	}
+
+	public List<RemoteFile> getFiles() {
+		return files;
+	}
+
+	public void setFiles(List<RemoteFile> files) {
+		this.files = files;
+	}
 }

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

@@ -4,18 +4,26 @@ 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 org.springframework.util.StringUtils;
 
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.erp.model.RemoteFile;
 import com.uas.platform.b2b.erp.model.SaleSampleApproval;
 import com.uas.platform.b2b.erp.model.SaleSampleDown;
 import com.uas.platform.b2b.erp.model.SaleSampleSend;
 import com.uas.platform.b2b.erp.service.SaleSampleDownService;
+import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingItem;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 
 @Service
 public class SaleSampleDownServiceImpl implements SaleSampleDownService {
+	
+	@Autowired
+	private AttachDao attachDao;
 
 	@Override
 	public List<SaleSampleDown> convertPurchaseProofingItems(
@@ -23,7 +31,19 @@ public class SaleSampleDownServiceImpl implements SaleSampleDownService {
 		List<SaleSampleDown> saleSampleDowns = new ArrayList<SaleSampleDown>();
 		if(!CollectionUtils.isEmpty(proofingItems)) {
 			for(PurchaseProofingItem proofingItem : proofingItems) {
-				saleSampleDowns.add(new SaleSampleDown(proofingItem));
+				SaleSampleDown sampleDown = new SaleSampleDown(proofingItem);
+				if (StringUtils.hasText(proofingItem.getProofing().getAttach())) {
+					String[] attachIds = proofingItem.getProofing().getAttach().split(",");
+					List<RemoteFile> files = new ArrayList<RemoteFile>();
+					for (String attachId : attachIds) {
+						Attach attach = attachDao.findOne(Long.parseLong(attachId));
+						if (attach != null) {
+							files.add(new RemoteFile(attach));
+						}
+					}
+					sampleDown.setFiles(files);
+				}
+				saleSampleDowns.add(sampleDown);
 			}
 		}
 		return saleSampleDowns;
@@ -59,7 +79,52 @@ public class SaleSampleDownServiceImpl implements SaleSampleDownService {
 		List<SaleSampleApproval> saleSampleApprovals = new ArrayList<SaleSampleApproval>();
 		if(!CollectionUtils.isEmpty(proofingApprovals)) {
 			for(PurchaseProofingApproval proofingApproval : proofingApprovals) {
-				saleSampleApprovals.add(new SaleSampleApproval(proofingApproval));
+				SaleSampleApproval approval = new SaleSampleApproval(proofingApproval);
+				if (StringUtils.hasText(proofingApproval.getAttach())) {
+					String[] attachIds = proofingApproval.getAttach().split(",");
+					List<RemoteFile> files = new ArrayList<RemoteFile>();
+					for (String attachId : attachIds) {
+						Attach attach = attachDao.findOne(Long.parseLong(attachId));
+						if (attach != null) {
+							files.add(new RemoteFile(attach));
+						}
+					}
+					approval.setFiles(files);
+				}
+				if (StringUtils.hasText(proofingApproval.getPrdattach())) {
+					String[] attachIds = proofingApproval.getPrdattach().split(",");
+					List<RemoteFile> files = new ArrayList<RemoteFile>();
+					for (String attachId : attachIds) {
+						Attach attach = attachDao.findOne(Long.parseLong(attachId));
+						if (attach != null) {
+							files.add(new RemoteFile(attach));
+						}
+					}
+					approval.setPrdfiles(files);
+				}
+				if (StringUtils.hasText(proofingApproval.getPpdattach())) {
+					String[] attachIds = proofingApproval.getPpdattach().split(",");
+					List<RemoteFile> files = new ArrayList<RemoteFile>();
+					for (String attachId : attachIds) {
+						Attach attach = attachDao.findOne(Long.parseLong(attachId));
+						if (attach != null) {
+							files.add(new RemoteFile(attach));
+						}
+					}
+					approval.setPpdfiles(files);
+				}
+				if (StringUtils.hasText(proofingApproval.getPadattach())) {
+					String[] attachIds = proofingApproval.getPadattach().split(",");
+					List<RemoteFile> files = new ArrayList<RemoteFile>();
+					for (String attachId : attachIds) {
+						Attach attach = attachDao.findOne(Long.parseLong(attachId));
+						if (attach != null) {
+							files.add(new RemoteFile(attach));
+						}
+					}
+					approval.setPadfiles(files);
+				}
+				saleSampleApprovals.add(approval);
 			}
 		}
 		return saleSampleApprovals;

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

@@ -144,6 +144,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		item.setReplyQty(replyQty + reply.getQty());
 		if (item.getReplyQty() > item.getQty())
 			throw new IllegalOperatorException("回复的数量合计超过了订单数量");
+		reply.setOrderItem(item);
 		reply = purchaseOrderReplyDao.save(reply);
 		purchaseOrderItemDao.updateByReply(reply.getDelivery(), reply.getRemark(), item.getId());
 		PurchaseOrder order = item.getOrder();