更新出入库单据对应的上传成功判定方法

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

@@ -1,15 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
-import com.uas.platform.b2b.model.MakeAcceptItem;
+import com.uas.platform.b2b.model.MakeAccept;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.MakeAccept;
+import java.util.List;
 
 
 @Repository
@@ -44,4 +42,12 @@ public interface MakeAcceptDao extends JpaSpecificationExecutor<MakeAccept>, Jpa
 	@Query("select count(p) from MakeAccept p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 通过企业UU和erpId获取对应的B2Bid
+	 *
+	 * @param enUU 企业UU
+	 * @param erpId erpId
+	 * @return
+	 */
+    List<MakeAccept> findByEnUUAndErpId(Long enUU, Long erpId);
 }

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

@@ -1,46 +1,52 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.MakeReturn;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.MakeReturn;
+import java.util.List;
 
 @Repository
 public interface MakeReturnDao extends JpaSpecificationExecutor<MakeReturn>, JpaRepository<MakeReturn, Long> {
-		/**
-		 * 按所属企业及编号查找委外验退单
-		 * @param enUU
-		 * @param code
-		 * @return
-		 */
-		public List<MakeReturn> findByEnUUAndCode(Long enUU, String code);
-		
-		/**
-		 * 卖家根据卖家UU号和下载状态获取需要下载的客户委外验收入库单
-		 * @return
-		 */
-		public List<MakeReturn> findByVendUUAndSendStatus(Long vendUU, short sendStatus);
-		
-		/**
-		 * 按卖家UU、反过账状态查找
-		 * @param vendUU
-		 * @param nonPosting
-		 * @return
-		 */
-		public List<MakeReturn> findByVendUUAndNonPosting(Long vendUU,Short nonPosting);
-		
-		/**
-		 * 根据供应商UU号获取客户委外验退单数量
-		 * @param vendUU
-		 * @return
-		 */
-		@Query("select count(p) from MakeReturn p where p.vendUU = :vendUU")
-		public long countByVendUU(@Param("vendUU")Long vendUU);
+	/**
+	 * 按所属企业及编号查找委外验退单
+	 * @param enUU
+	 * @param code
+	 * @return
+	 */
+	public List<MakeReturn> findByEnUUAndCode(Long enUU, String code);
+
+	/**
+	 * 卖家根据卖家UU号和下载状态获取需要下载的客户委外验收入库单
+	 * @return
+	 */
+	public List<MakeReturn> findByVendUUAndSendStatus(Long vendUU, short sendStatus);
+
+	/**
+	 * 按卖家UU、反过账状态查找
+	 * @param vendUU
+	 * @param nonPosting
+	 * @return
+	 */
+	public List<MakeReturn> findByVendUUAndNonPosting(Long vendUU,Short nonPosting);
 
+	/**
+	 * 根据供应商UU号获取客户委外验退单数量
+	 * @param vendUU
+	 * @return
+	 */
+	@Query("select count(p) from MakeReturn p where p.vendUU = :vendUU")
+	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 通过enUU和erpId查询委外验退单是否存在
+	 *
+	 * @param enUU 企业UU号
+	 * @param erpId erpId
+	 * @return
+	 */
+    List<MakeReturn> findByEnUUAndErpId(Long enUU, Long erpId);
 }

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

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseAccept;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseAccept;
+import java.util.List;
 
 @Repository
 public interface PurchaseAcceptDao extends JpaSpecificationExecutor<PurchaseAccept>, JpaRepository<PurchaseAccept, Long> {
@@ -45,4 +44,12 @@ public interface PurchaseAcceptDao extends JpaSpecificationExecutor<PurchaseAcce
 	@Query("select count(p) from PurchaseAccept p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 通过enUU和erpId查询对应的单据
+	 *
+	 * @param enUU 企业UU
+	 * @param sourceId 对应的erpId
+	 * @return
+	 */
+	List<PurchaseAccept> findByEnUUAndErpId(Long enUU, Long sourceId);
 }

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

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseBadIn;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseBadIn;
+import java.util.List;
 
 @Repository
 public interface PurchaseBadInDao extends JpaSpecificationExecutor<PurchaseBadIn>, JpaRepository<PurchaseBadIn, Long> {
@@ -45,4 +44,12 @@ public interface PurchaseBadInDao extends JpaSpecificationExecutor<PurchaseBadIn
 	@Query("select count(p) from PurchaseBadIn p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 通过企业UU和对应的erpid查询不良品入库单的id
+	 *
+	 * @param enUU 企业UU
+	 * @param erpId erpId
+	 * @return
+	 */
+	List<PurchaseBadIn> findByEnUUAndErpId(Long enUU, Long erpId);
 }

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

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseBadOut;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseBadOut;
+import java.util.List;
 
 @Repository
 public interface PurchaseBadOutDao extends JpaSpecificationExecutor<PurchaseBadOut>, JpaRepository<PurchaseBadOut, Long> {
@@ -45,4 +44,12 @@ public interface PurchaseBadOutDao extends JpaSpecificationExecutor<PurchaseBadO
 	@Query("select count(p) from PurchaseBadOut p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 通过企业UU和对应的erpid查询不良品出库单的id
+	 *
+	 * @param enUU 企业UU
+	 * @param erpId erpId
+	 * @return
+	 */
+	List<PurchaseBadOut> findByEnUUAndErpId(Long enUU, Long erpId);
 }

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

@@ -1,15 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
-import com.uas.platform.b2b.model.PurchaseReturnItem;
+import com.uas.platform.b2b.model.PurchaseReturn;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseReturn;
+import java.util.List;
 
 @Repository
 public interface PurchaseReturnDao extends JpaSpecificationExecutor<PurchaseReturn>, JpaRepository<PurchaseReturn, Long> {
@@ -46,4 +44,12 @@ public interface PurchaseReturnDao extends JpaSpecificationExecutor<PurchaseRetu
 	@Query("select count(p) from PurchaseReturn p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 通过enUU和erpId查询采购验退单是否存在
+	 *
+	 * @param enUU 企业UU号
+	 * @param erpId erpId
+	 * @return
+	 */
+    List<PurchaseReturn> findByEnUUAndErpId(Long enUU, Long erpId);
 }

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

@@ -1,9 +1,11 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
+import com.uas.platform.b2b.erp.model.MakeProdInOut;
+import com.uas.platform.b2b.erp.service.MakeProdInOutService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.service.MakeAcceptService;
+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;
@@ -11,12 +13,9 @@ 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.MakeProdInOut;
-import com.uas.platform.b2b.erp.service.MakeProdInOutService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.MakeAcceptService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 
 /**
  * 对买家ERP的数据接口
@@ -45,11 +44,12 @@ public class MakeProdInOutController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void saveProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<MakeProdInOut> saveProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<MakeProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, MakeProdInOut.class);
 		makeAcceptService.save(makeProdInOutService.convertProdInOuts(prodInOuts));
 		logger.log("委外验收单", "上传委外验收单", prodInOuts.size());
+		return makeProdInOutService.getMakeAcceptB2bId(prodInOuts);
 	}
 
 	/**

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

@@ -1,9 +1,11 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
+import com.uas.platform.b2b.erp.model.MakeProdInOut;
+import com.uas.platform.b2b.erp.service.MakeProdInOutService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.service.MakeReturnService;
+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;
@@ -11,12 +13,9 @@ 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.MakeProdInOut;
-import com.uas.platform.b2b.erp.service.MakeProdInOutService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.MakeReturnService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 
 /**
  * 对买家ERP的数据接口 买家委外验退单接口
@@ -45,11 +44,12 @@ public class MakeProdReturnController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void saveMakeProdReturn(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<MakeProdInOut> saveMakeProdReturn(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<MakeProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, MakeProdInOut.class);
 		makeReturnService.save(makeProdInOutService.convertReturns(prodInOuts));
 		logger.log("委外验退单", "上传委外验退单", prodInOuts.size());
+		return makeProdInOutService.getMakeReturnB2bId(prodInOuts);
 	}
 
 	/**

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

@@ -1,9 +1,11 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
+import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
+import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.service.PurchaseBadInService;
+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;
@@ -11,12 +13,9 @@ 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.PurchaseProdInOut;
-import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.PurchaseBadInService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 
 /**
  * 对买家ERP的数据接口<br>
@@ -46,11 +45,12 @@ public class PurchaseProdBadInController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<PurchaseProdInOut> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseBadInService.save(purchaseProdInOutService.convertBadIns(prodInOuts));
 		logger.log("不良品入库单", "上传不良品入库单", prodInOuts.size());
+		return purchaseProdInOutService.getProdBadInB2bId(prodInOuts);
 	}
 
 	/**

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

@@ -1,9 +1,11 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
+import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
+import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.service.PurchaseBadOutService;
+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;
@@ -11,12 +13,9 @@ 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.PurchaseProdInOut;
-import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.PurchaseBadOutService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 
 /**
  * 对买家ERP的数据接口<br>
@@ -46,11 +45,12 @@ public class PurchaseProdBadOutController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<PurchaseProdInOut> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseBadOutService.save(purchaseProdInOutService.convertBadOuts(prodInOuts));
 		logger.log("不良品出库单", "上传不良品出库单", prodInOuts.size());
+		return purchaseProdInOutService.getProdBadOutB2bId(prodInOuts);
 	}
 
 	/**

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

@@ -4,11 +4,7 @@ import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
 import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.MakeAcceptService;
-import com.uas.platform.b2b.service.MakeReturnService;
-import com.uas.platform.b2b.service.PurchaseAcceptService;
-import com.uas.platform.b2b.service.PurchaseApBillService;
-import com.uas.platform.b2b.service.PurchaseReturnService;
+import com.uas.platform.b2b.service.*;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,11 +58,12 @@ public class PurchaseProdInOutController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void saveProdInOuts(@RequestParam("data") String data) throws Exception {
+	public List<PurchaseProdInOut> saveProdInOuts(@RequestParam("data") String data) throws Exception {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseAcceptService.save(purchaseProdInOutService.convertProdInOuts(prodInOuts));
 		logger.log("采购验收单", "上传采购验收单", prodInOuts.size());
+		return purchaseProdInOutService.getAcceptB2bId(prodInOuts);
 	}
 
 	/**

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

@@ -45,11 +45,12 @@ public class PurchaseProdReturnController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void savePurchases(@RequestParam("data") String data) throws Exception {
+	public List<PurchaseProdInOut> savePurchases(@RequestParam("data") String data) throws Exception {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseReturnService.save(purchaseProdInOutService.convertReturns(prodInOuts));
 		logger.log("采购验退单", "上传采购验退单", prodInOuts.size());
+		return purchaseProdInOutService.getReturnB2bId(prodInOuts);
 	}
 
 	/**

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

@@ -1,20 +1,15 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.uas.platform.b2b.model.EnterpriseInfo;
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Status;
+import org.springframework.util.CollectionUtils;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.model.MakeAccept;
-import com.uas.platform.b2b.model.MakeAcceptItem;
-import com.uas.platform.b2b.model.MakeReturn;
-import com.uas.platform.b2b.model.MakeReturnItem;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Status;
-
 /**
  * 采购方角度ERP委外验收单
  * 
@@ -23,20 +18,80 @@ import com.uas.platform.core.model.Status;
  */
 public class MakeProdInOut {
 
-	private Long pi_id;// ERP对应的id
-	private String pi_inoutno;// 委外验收单号
-	private Long pi_vendoruu;// 委外供应商uu号
-	private String pi_currency;// 币别
-	private Float pi_rate;// 汇率
-	private String pi_payment;// 付款方式
-	private String pi_transport;// 运输方式
-	private String pi_remark;// 备注
-	private String pi_inoutman;// 过账人
-	private Date pi_date;// 过账日期
-	private String pi_sendcode;// 送货单号
-	private String pi_receivecode;// 应付供应商编号
-	private String pi_receivename;// 应付供应商名称
-	private List<MakeProdInOutDetail> details;// 明细
+	/**
+	 * erp出入库单据的id
+	 */
+	private Long pi_id;
+
+	/**
+	 * erp出入库单据单号
+	 */
+	private String pi_inoutno;
+
+	/**
+	 * 供应商UU
+	 */
+	private Long pi_vendoruu;
+
+	/**
+	 * 币别
+	 */
+	private String pi_currency;
+
+	/**
+	 * 汇率
+	 */
+	private Float pi_rate;
+
+	/**
+	 * 付款方式
+	 */
+	private String pi_payment;
+
+	/**
+	 * 运输方式
+	 */
+	private String pi_transport;
+
+	/**
+	 * 备注
+	 */
+	private String pi_remark;
+
+	/**
+	 * 过账人
+	 */
+	private String pi_inoutman;
+
+	/**
+	 * 过账日期
+	 */
+	private Date pi_date;
+
+	/**
+	 * 送货单号
+	 */
+	private String pi_sendcode;
+
+	/**
+	 * 应付供应商名
+	 */
+	private String pi_receivename;
+
+	/**
+	 * 应付供应商编号
+	 */
+	private String pi_receivecode;
+
+	/**
+	 * 明细
+	 */
+	private List<MakeProdInOutDetail> details;
+
+	/**
+	 * b2bId
+	 */
+	private Long pi_b2b_id;
 
 	public Long getPi_id() {
 		return pi_id;
@@ -150,6 +205,14 @@ public class MakeProdInOut {
 		this.details = details;
 	}
 
+	public Long getPi_b2b_id() {
+		return pi_b2b_id;
+	}
+
+	public void setPi_b2b_id(Long pi_b2b_id) {
+		this.pi_b2b_id = pi_b2b_id;
+	}
+
 	public MakeAccept convent() {
 		MakeAccept accept = new MakeAccept();
 		accept.setErpId(this.pi_id);

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

@@ -19,20 +19,80 @@ import java.util.Set;
  */
 public class PurchaseProdInOut {
 
-	private Long pi_id;// id
-	private String pi_inoutno;// 采购检验单号
-	private Long pi_vendoruu;// 客户uu号
-	private String pi_currency;// 币别
-	private Float pi_rate;// 汇率
-	private String pi_payment;// 付款方式
-	private String pi_transport;// 运输方式
-	private String pi_remark;// 备注
-	private String pi_inoutman;// 过账人
-	private Date pi_date;// 过账日期
-	private String pi_sendcode;// 送货单号
-	private String pi_receivename;// 应付供应商名
-	private String pi_receivecode;// 应付供应商编号
-	private List<PurchaseProdInOutDetail> details;// 明细
+	/**
+	 * erp出入库单据的id
+	 */
+	private Long pi_id;
+
+    /**
+     * erp出入库单据单号
+     */
+    private String pi_inoutno;
+
+    /**
+     * 供应商UU
+     */
+    private Long pi_vendoruu;
+
+    /**
+     * 币别
+     */
+    private String pi_currency;
+
+    /**
+     * 汇率
+     */
+    private Float pi_rate;
+
+    /**
+     * 付款方式
+     */
+    private String pi_payment;
+
+    /**
+     * 运输方式
+     */
+    private String pi_transport;
+
+    /**
+     * 备注
+     */
+	private String pi_remark;
+
+    /**
+     * 过账人
+     */
+    private String pi_inoutman;
+
+    /**
+     * 过账日期
+     */
+    private Date pi_date;
+
+    /**
+     * 送货单号
+     */
+    private String pi_sendcode;
+
+    /**
+     * 应付供应商名
+     */
+    private String pi_receivename;
+
+    /**
+     * 应付供应商编号
+     */
+    private String pi_receivecode;
+
+    /**
+     * 明细
+     */
+    private List<PurchaseProdInOutDetail> details;
+
+    /**
+     * b2bId
+     */
+    private Long pi_b2b_id;
 
 	public Long getPi_id() {
 		return pi_id;
@@ -146,7 +206,15 @@ public class PurchaseProdInOut {
 		this.details = details;
 	}
 
-	public PurchaseAccept convent() {
+    public Long getPi_b2b_id() {
+        return pi_b2b_id;
+    }
+
+    public void setPi_b2b_id(Long pi_b2b_id) {
+        this.pi_b2b_id = pi_b2b_id;
+    }
+
+    public PurchaseAccept convent() {
 		PurchaseAccept accept = new PurchaseAccept();
 		accept.setCode(this.pi_inoutno);
 		accept.setCurrency(this.pi_currency);

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

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.erp.service;
 
-import java.util.List;
-
 import com.uas.platform.b2b.erp.model.MakeProdInOut;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.MakeAcceptItem;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.MakeReturnItem;
 
+import java.util.List;
+
 public interface MakeProdInOutService {
 	
 	/**
@@ -38,7 +38,20 @@ public interface MakeProdInOutService {
 	 * @return
 	 */
 	List<MakeReturn> convertNonPostingReturns(List<MakeProdInOut> prodInOuts);
-	
-	
-	
+
+	/**
+	 * 获取委外验收单对应的B2Bid
+	 *
+	 * @param prodInOuts erp委外验收单
+	 * @return
+	 */
+    List<MakeProdInOut> getMakeAcceptB2bId(List<MakeProdInOut> prodInOuts);
+
+    /**
+     * 获取委外验退单对应的B2Bid
+     *
+     * @param prodInOuts erp委外验退单
+     * @return
+     */
+    List<MakeProdInOut> getMakeReturnB2bId(List<MakeProdInOut> prodInOuts);
 }

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

@@ -1,17 +1,10 @@
 package com.uas.platform.b2b.erp.service;
 
-import java.util.List;
-
 import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseAcceptItem;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadInItem;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseBadOutItem;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.PurchaseReturnItem;
+import com.uas.platform.b2b.model.*;
+
+import java.util.List;
 
 public interface PurchaseProdInOutService {
 
@@ -83,4 +76,35 @@ public interface PurchaseProdInOutService {
 	 */
 	List<PurchaseAcceptItem> convertPirceForProdIn(List<ProdInOutRefreshPrice> prodInOuts);
 
+	/**
+	 * 获取采购验收单对应的B2Bid
+	 *
+	 * @param prodInOuts ERP采购验收单
+	 * @return
+	 */
+    List<PurchaseProdInOut> getAcceptB2bId(List<PurchaseProdInOut> prodInOuts);
+
+    /**
+     * 获取采购验退单对应的B2Bid
+     *
+     * @param prodInOuts ERP采购验退单
+     * @return
+     */
+    List<PurchaseProdInOut> getReturnB2bId(List<PurchaseProdInOut> prodInOuts);
+
+    /**
+     * 获取不良品入库单对应的B2Bid
+     *
+     * @param prodInOuts erp不良品入库单
+     * @return
+     */
+    List<PurchaseProdInOut> getProdBadInB2bId(List<PurchaseProdInOut> prodInOuts);
+
+    /**
+     * 获取不良品出库单对应的B2Bid
+     *
+     * @param prodInOuts erp不良品出库单
+     * @return
+     */
+    List<PurchaseProdInOut> getProdBadOutB2bId(List<PurchaseProdInOut> prodInOuts);
 }

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

@@ -126,4 +126,37 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 		return returns;
 	}
 
+	/**
+	 * 获取委外验收单对应的B2Bid
+	 *
+	 * @param prodInOuts erp委外验收单
+	 * @return
+	 */
+	@Override
+	public List<MakeProdInOut> getMakeAcceptB2bId(List<MakeProdInOut> prodInOuts) {
+		for (MakeProdInOut inOut : prodInOuts) {
+			List<MakeAccept> accepts = makeAcceptDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(), inOut.getPi_id());
+			if (!CollectionUtils.isEmpty(accepts)) {
+                inOut.setPi_b2b_id(accepts.get(0).getId());
+			}
+		}
+		return prodInOuts;
+	}
+
+    /**
+     * 获取委外验退单对应的B2Bid
+     *
+     * @param prodInOuts erp委外验退单
+     * @return
+     */
+    @Override
+    public List<MakeProdInOut> getMakeReturnB2bId(List<MakeProdInOut> prodInOuts) {
+        for (MakeProdInOut inOut : prodInOuts) {
+            List<MakeReturn> returns = makeReturnDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(), inOut.getPi_id());
+            if (!CollectionUtils.isEmpty(returns)) {
+                inOut.setPi_b2b_id(returns.get(0).getId());
+            }
+        }
+        return prodInOuts;
+    }
 }

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

@@ -334,4 +334,76 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 		return acceptItems;
 	}
 
+	/**
+	 * 获取B2B对应的id
+	 *
+	 * @param prodInOuts ERP采购验收单
+	 * @return
+	 */
+	@Override
+	public List<PurchaseProdInOut> getAcceptB2bId(List<PurchaseProdInOut> prodInOuts) {
+	    for (PurchaseProdInOut inOut : prodInOuts) {
+            List<PurchaseAccept> existAccepts = purchaseAcceptDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(),
+                    inOut.getPi_id());
+            if (!CollectionUtils.isEmpty(existAccepts)) {
+                inOut.setPi_b2b_id(existAccepts.get(0).getId());
+            }
+        }
+		return prodInOuts;
+	}
+
+    /**
+     * 获取采购验退单对应的B2Bid
+     *
+     * @param prodInOuts ERP采购验退单
+     * @return
+     */
+    @Override
+    public List<PurchaseProdInOut> getReturnB2bId(List<PurchaseProdInOut> prodInOuts) {
+        for (PurchaseProdInOut inOut : prodInOuts) {
+            List<PurchaseReturn> existReturns = purchaseReturnDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(),
+                    inOut.getPi_id());
+            if (!CollectionUtils.isEmpty(existReturns)) {
+                inOut.setPi_b2b_id(existReturns.get(0).getId());
+            }
+        }
+        return prodInOuts;
+    }
+
+    /**
+     * 获取不良品出库单对应的B2Bid
+     *
+     * @param prodInOuts erp不良品出库单
+     * @return
+     */
+    @Override
+    public List<PurchaseProdInOut> getProdBadInB2bId(List<PurchaseProdInOut> prodInOuts) {
+        for (PurchaseProdInOut inOut : prodInOuts) {
+            List<PurchaseBadIn> existBadIns = purchaseBadInDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(),
+                    inOut.getPi_id());
+            if (!CollectionUtils.isEmpty(existBadIns)) {
+                inOut.setPi_b2b_id(existBadIns.get(0).getId());
+            }
+        }
+        return prodInOuts;
+    }
+
+    /**
+     * 获取不良品出库单对应的B2Bid
+     *
+     * @param prodInOuts erp不良品出库单
+     * @return
+     */
+    @Override
+    public List<PurchaseProdInOut> getProdBadOutB2bId(List<PurchaseProdInOut> prodInOuts) {
+        for (PurchaseProdInOut inOut : prodInOuts) {
+            List<PurchaseBadOut> existBadOuts = purchaseBadOutDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(),
+                    inOut.getPi_id());
+            if (!CollectionUtils.isEmpty(existBadOuts)) {
+                inOut.setPi_b2b_id(existBadOuts.get(0).getId());
+            }
+        }
+        return prodInOuts;
+    }
+
 }