更新发货提醒上传到平台成功的判断方法

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

@@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -55,12 +54,13 @@ public class PurchaseNotifyController {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public void saveNotifies(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<PurchaseNotify> saveNotifies(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseNotify> notifies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
-		List<PurchaseNotice> lists = purchaseNotifyService.convertPurchaseNotify(notifies);
-		purchaseNoticeService.save(lists);
+		List<PurchaseNotice> noticeList = purchaseNotifyService.convertPurchaseNotify(notifies);
+		noticeList = purchaseNoticeService.save(noticeList);
 		logger.log("送货提醒", "上传送货提醒", notifies.size());
+		return purchaseNotifyService.convertPurchaseNotice(noticeList);
 	}
 
 	/**

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

@@ -172,4 +172,15 @@ public class PurchaseNotify {
 		return notice;
 	}
 
+    /**
+     * 将平台的发货提醒封装成ERP系统的发货提醒
+     *
+     * @param notice 平台发货提醒
+     */
+	public PurchaseNotify(PurchaseNotice notice) {
+        this.pn_b2bid = notice.getId();
+        this.pn_id = notice.getSourceId();
+	}
+
+	public PurchaseNotify() {}
 }

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

@@ -21,6 +21,14 @@ public interface PurchaseNotifyService {
 	 */
 	List<PurchaseNotice> convertPurchaseNotify(List<PurchaseNotify> notifies);
 
+	/**
+	 * 将平台的发货提醒封装成ERP系统的发货提醒
+	 *
+	 * @param noticeList 平台发货提醒
+	 * @return
+	 */
+	List<PurchaseNotify> convertPurchaseNotice(List<PurchaseNotice> noticeList);
+
 	/**
 	 * 将平台的发货单，转为买家ERP的收料通知单
 	 * 

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

@@ -95,6 +95,21 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 		return notices;
 	}
 
+	/**
+	 * 将平台的发货提醒封装成ERP系统的发货提醒
+	 *
+	 * @param noticeList 平台发货提醒
+	 * @return
+	 */
+	@Override
+	public List<PurchaseNotify> convertPurchaseNotice(List<PurchaseNotice> noticeList) {
+		List<PurchaseNotify> notifyList = new ArrayList<>();
+		for (PurchaseNotice notice : noticeList) {
+            notifyList.add(new PurchaseNotify(notice));
+		}
+		return notifyList;
+	}
+
 
 	@Override
 	public List<List<PurchaseNotice>> convertEDIPurchaseNotify(List<PurchaseNotify> notifies, Long enUU) {

src/main/java/com/uas/platform/b2b/service/PurchaseNoticeService.java

@@ -1,20 +1,13 @@
 package com.uas.platform.b2b.service;
 
-import java.util.List;
-import java.util.Map;
-
+import com.uas.platform.b2b.erp.model.PurchaseNotify;
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.core.model.PageInfo;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.data.domain.Page;
 
-import com.uas.platform.b2b.erp.model.PurchaseNotify;
-import com.uas.platform.b2b.model.BarLabelPrintSetting;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.SaleSend;
-import com.uas.platform.b2b.model.SaleSendAll;
-import com.uas.platform.b2b.model.SaleSendItem;
-import com.uas.platform.b2b.model.SaleSendItemVerify;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.core.model.PageInfo;
+import java.util.List;
+import java.util.Map;
 
 public interface PurchaseNoticeService {
 	
@@ -36,7 +29,7 @@ public interface PurchaseNoticeService {
 	 * @param notices
 	 * @return
 	 */
-	public void save(List<PurchaseNotice> notices);
+	public List<PurchaseNotice> save(List<PurchaseNotice> notices);
 
 	/**
 	 * 批量结案客户送货提醒

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

@@ -107,10 +107,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
     private PersonalProductService personalProductService;
 
 	@Override
-	public void save(List<PurchaseNotice> notices) {
+	public List<PurchaseNotice> save(List<PurchaseNotice> notices) {
 		notices = purchaseNoticeDao.save(notices);
 		saveUserOrders(notices);
 		ContextUtils.publishEvent(new PurchaseNoticeSaveReleaseEvent(notices));
+		return notices;
 	}
 
 	private void saveUserOrders(final List<PurchaseNotice> notices) {