更新MRB单上传成功的判断方法

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

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseMRB;
 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.PurchaseMRB;
+import java.util.List;
 
 @Repository
 public interface PurchaseMRBDao extends JpaSpecificationExecutor<PurchaseMRB>, JpaRepository<PurchaseMRB, Long> {
@@ -36,4 +35,12 @@ public interface PurchaseMRBDao extends JpaSpecificationExecutor<PurchaseMRB>, J
 	@Query("select count(p) from PurchaseMRB p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
+	/**
+	 * 根据enUU和ERPid查询对应的B2Bid
+	 *
+	 * @param enUU 企业uu
+	 * @param erpId erpId
+	 * @return
+	 */
+    List<PurchaseMRB> findByEnUUAndErpId(Long enUU, Long erpId);
 }

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseQuaMRBController.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.PurchaseQuaMRB;
+import com.uas.platform.b2b.erp.service.PurchaseQuaMRBService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.service.PurchaseMRBService;
+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.PurchaseQuaMRB;
-import com.uas.platform.b2b.erp.service.PurchaseQuaMRBService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.PurchaseMRBService;
-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 PurchaseQuaMRBController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<PurchaseQuaMRB> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseQuaMRB> quaMRBs = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseQuaMRB.class);
 		purchaseMRBService.save(purchaseQuaMRBService.convertMRBs(quaMRBs));
 		logger.log("采购变更单", "上传采购验退单", quaMRBs.size());
+		return purchaseQuaMRBService.getB2bId(quaMRBs);
 	}
 
 }

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

@@ -38,6 +38,12 @@ public class PurchaseQuaMRB {
 	private List<PurchaseQuaMRBCheckItem> checkItems;// 检验明细行
 	private List<PurchaseQuaMRBProjectItem> projectItems;// 项目明细行
 
+    /**
+     * B2Bid
+     * @return
+     */
+    private Long mr_b2bid;
+
 	public String getMr_code() {
 		return mr_code;
 	}
@@ -190,7 +196,15 @@ public class PurchaseQuaMRB {
 		this.attaches = attaches;
 	}
 
-	public PurchaseMRB convent() {
+    public Long getMr_b2bid() {
+        return mr_b2bid;
+    }
+
+    public void setMr_b2bid(Long mr_b2bid) {
+        this.mr_b2bid = mr_b2bid;
+    }
+
+    public PurchaseMRB convent() {
 		PurchaseMRB purchaseMRB = new PurchaseMRB();
 		purchaseMRB.setCheckQty(mr_checkqty);
 		purchaseMRB.setCode(mr_code);

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

@@ -1,10 +1,10 @@
 package com.uas.platform.b2b.erp.service;
 
-import java.util.List;
-
 import com.uas.platform.b2b.erp.model.PurchaseQuaMRB;
 import com.uas.platform.b2b.model.PurchaseMRB;
 
+import java.util.List;
+
 public interface PurchaseQuaMRBService {
 
 	/**
@@ -15,4 +15,11 @@ public interface PurchaseQuaMRBService {
 	 */
 	List<PurchaseMRB> convertMRBs(List<PurchaseQuaMRB> quaMRBs);
 
+	/**
+	 * 获取B2B对应的id
+	 *
+	 * @param quaMRBs ERP系统的MRB单
+	 * @return
+	 */
+    List<PurchaseQuaMRB> getB2bId(List<PurchaseQuaMRB> quaMRBs);
 }

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

@@ -1,12 +1,5 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
 import com.uas.platform.b2b.dao.PurchaseMRBDao;
@@ -18,6 +11,13 @@ import com.uas.platform.b2b.model.PurchaseBadIn;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class PurchaseQuaMRBServiceImpl implements PurchaseQuaMRBService {
@@ -62,4 +62,20 @@ public class PurchaseQuaMRBServiceImpl implements PurchaseQuaMRBService {
 		return mrbs;
 	}
 
+	/**
+	 * 获取B2B对应的id
+	 *
+	 * @param quaMRBs ERP系统的MRB单
+	 * @return
+	 */
+	@Override
+	public List<PurchaseQuaMRB> getB2bId(List<PurchaseQuaMRB> quaMRBs) {
+		for (PurchaseQuaMRB mrb : quaMRBs) {
+			List<PurchaseMRB> mrbList = purchaseMRBDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(), mrb.getMr_id());
+			if (!CollectionUtils.isEmpty(mrbList)) {
+				mrb.setMr_b2bid(mrbList.get(0).getId());
+			}
+		}
+		return quaMRBs;
+	}
 }