更新打样申请单上传成功的判断方法

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

@@ -21,4 +21,13 @@ public interface PurchaseProofingDao
 	public List<PurchaseProofing> findByEnUUAndCode(long enUU, String code);
 
     List<PurchaseProofing> findByErpId(long l);
+
+    /**
+     * 通过企业UU和erpId查询单据是否存在
+     *
+     * @param enUU 企业UU
+     * @param erpId erpId
+     * @return
+     */
+    List<PurchaseProofing> findByEnUUAndErpId(Long enUU, Long erpId);
 }

src/main/java/com/uas/platform/b2b/erp/controller/ProductSampleController.java

@@ -1,17 +1,5 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.uas.platform.b2b.erp.model.ProductSample;
 import com.uas.platform.b2b.erp.model.ProductSampleApproval;
 import com.uas.platform.b2b.erp.model.SaleSampleSend;
@@ -24,6 +12,17 @@ import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 对买家ERP的数据接口<br>
@@ -59,11 +58,12 @@ public class ProductSampleController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void saveProductSamples(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<ProductSample> saveProductSamples(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<ProductSample> productSamples = FlexJsonUtils.fromJsonArray(jsonStr, ProductSample.class);
 		purchaseProofingService.save(purchaseSampleService.convertProofing(productSamples));
 		logger.log("打样申请", "买家上传打样申请", productSamples.size());
+		return purchaseSampleService.getB2bId(productSamples);
 	}
 
 	/**

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

@@ -1,19 +1,14 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.support.SystemSession;
+import org.apache.commons.collections.CollectionUtils;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
-
-import com.uas.platform.b2b.model.EnterpriseInfo;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseProofing;
-import com.uas.platform.b2b.model.PurchaseProofingItem;
-import com.uas.platform.b2b.model.UserBaseInfo;
-import com.uas.platform.b2b.support.SystemSession;
-
 /**
  * 买家ERP系统的采购询价单
  * 
@@ -36,6 +31,7 @@ public class ProductSample {
 	private String ps_attach;// 附件
 	private List<Attach> attaches;// 附件
 	private List<ProductSampleDetail> details;
+	private Long ps_b2bid;// B2Bid
 
 	public Long getPs_id() {
 		return ps_id;
@@ -141,7 +137,15 @@ public class ProductSample {
 		this.details = details;
 	}
 
-	/**
+    public Long getPs_b2bid() {
+        return ps_b2bid;
+    }
+
+    public void setPs_b2bid(Long ps_b2bid) {
+        this.ps_b2bid = ps_b2bid;
+    }
+
+    /**
 	 * @return
 	 */
 	public PurchaseProofing convert() {

src/main/java/com/uas/platform/b2b/erp/service/PurchaseSampleService.java

@@ -1,18 +1,18 @@
 package com.uas.platform.b2b.erp.service;
 
-import java.util.List;
-
 import com.uas.platform.b2b.erp.model.ProductSample;
 import com.uas.platform.b2b.erp.model.ProductSampleApproval;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingItem;
 
+import java.util.List;
+
 public interface PurchaseSampleService {
 
 	/**
 	 * 将ERP系统的打样申请，转为平台的客户打样申请单
 	 * 
-	 * @param inquiries
+	 * @param samples
 	 * @return
 	 */
 	List<PurchaseProofingItem> convertProofing(List<ProductSample> samples);
@@ -24,5 +24,11 @@ public interface PurchaseSampleService {
 	 */
 	List<PurchaseProofingApproval> convertApproval(List<ProductSampleApproval> sampleApprovals);
 
-
+	/**
+	 * 查询打样申请单对应的平台的id
+     *
+	 * @param productSamples 打样申请
+	 * @return
+	 */
+    List<ProductSample> getB2bId(List<ProductSample> productSamples);
 }

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

@@ -141,4 +141,20 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 		return proofingApprovals;
 	}
 
+	/**
+	 * 查询打样申请单对应的平台的id
+	 *
+	 * @param productSamples 打样申请
+	 * @return
+	 */
+	@Override
+	public List<ProductSample> getB2bId(List<ProductSample> productSamples) {
+	    for (ProductSample sample : productSamples) {
+	        List<PurchaseProofing> proofings = purchaseProofingDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(), sample.getPs_id());
+	        if (!CollectionUtils.isEmpty(proofings)) {
+	            sample.setPs_b2bid(proofings.get(0).getId());
+            }
+        }
+		return productSamples;
+	}
 }