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

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

@@ -22,5 +22,17 @@ public interface PurchaseOrderChangeDao extends JpaSpecificationExecutor<Purchas
 	 */
 	@Query("from PurchaseOrderChange r where r.order.enUU = :enUU and r.status = :status and r.backStatus = :backStatus")
 	public List<PurchaseOrderChange> findByEnUUAndStatusAndBackStatus(@Param("enUU") long enUU, @Param("status") short status,
-			@Param("sendStatus") short sendStatus);
+			@Param("backStatus") short backStatus);
+
+	/**
+	 * 卖家按上传状态查找变更单
+	 * 
+	 * @param vendUU
+	 *            卖方企业ID
+	 * @param status
+	 *            状态
+	 * @return
+	 */
+	@Query("from PurchaseOrderChange r where r.order.vendUU = :vendUU and r.sendStatus = :sendStatus")
+	public List<PurchaseOrderChange> findByVendUUAndSendStatus(@Param("vendUU") long vendUU, @Param("sendStatus") short sendStatus);
 }

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

@@ -1,7 +1,16 @@
 package com.uas.platform.b2b.erp.controller;
 
+import java.util.List;
+
+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.ResponseBody;
+
+import com.uas.platform.b2b.erp.model.SaleDownChange;
+import com.uas.platform.b2b.erp.service.SaleDownChangeService;
+import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 
 /**
  * 对卖家ERP的数据接口<br>
@@ -12,7 +21,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 @RequestMapping("/erp/sale/change")
 public class SaleDownChangeController {
-	
-	
-	
+
+	@Autowired
+	private PurchaseOrderChangeService purchaseOrderChangeService;
+
+	@Autowired
+	private SaleDownChangeService saleDownChangeService;
+
+	/**
+	 * 卖家ERP从平台获取未回复的采购变更单
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public List<SaleDownChange> getOrderChanges() {
+		return saleDownChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findNotUploadOrderChange());
+	}
+
 }

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

@@ -1,7 +1,18 @@
 package com.uas.platform.b2b.erp.service;
 
-public class SaleDownChangeService {
-	
-	
-	
+import java.util.List;
+
+import com.uas.platform.b2b.erp.model.SaleDownChange;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+
+public interface SaleDownChangeService {
+
+	/**
+	 * 将平台里面的采购变更单，转为供应商ERP的客户采购变更单
+	 * 
+	 * @param orderChanges
+	 * @return
+	 */
+	List<SaleDownChange> convertPurchaseOrderChange(List<PurchaseOrderChange> orderChanges);
+
 }

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

@@ -0,0 +1,23 @@
+package com.uas.platform.b2b.erp.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.erp.model.SaleDownChange;
+import com.uas.platform.b2b.erp.service.SaleDownChangeService;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+
+@Service
+public class SaleDownChangeServiceImpl implements SaleDownChangeService {
+
+	@Override
+	public List<SaleDownChange> convertPurchaseOrderChange(List<PurchaseOrderChange> orderChanges) {
+		List<SaleDownChange> changes = new ArrayList<SaleDownChange>();
+		for (PurchaseOrderChange orderChange : orderChanges)
+			changes.add(new SaleDownChange(orderChange));
+		return changes;
+	}
+
+}

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

@@ -21,7 +21,7 @@ public interface PurchaseOrderChangeService {
 	 * @return
 	 */
 	public List<PurchaseOrderChange> findNotUploadReply();
-	
+
 	/**
 	 * 回复信息成功传到买家ERP之后
 	 * 
@@ -29,4 +29,11 @@ public interface PurchaseOrderChangeService {
 	 */
 	public void onReplyUploadSuccess(String[] idArray);
 
+	/**
+	 * 查找所有待上传到供应商ERP的变更单
+	 * 
+	 * @return
+	 */
+	public List<PurchaseOrderChange> findNotUploadOrderChange();
+
 }

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

@@ -62,4 +62,10 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		}
 	}
 
+	@Override
+	public List<PurchaseOrderChange> findNotUploadOrderChange() {
+		return purchaseOrderChangeDao.findByVendUUAndSendStatus(SystemSession.getUser().getEnterprise().getUu(),
+				(short) Status.NOT_UPLOAD.value());
+	}
+
 }