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

src/main/java/com/uas/platform/b2b/mobile/controller/SaleChangeController.java

@@ -1,7 +1,19 @@
 package com.uas.platform.b2b.mobile.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 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.mobile.model.PurchaseChange;
+import com.uas.platform.b2b.mobile.service.PurchaseChangeService;
+import com.uas.platform.b2b.service.PurchaseOrderChangeService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 /**
  * 对移动端的数据接口<br>
@@ -14,4 +26,37 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("/mobile/sale/changes")
 public class SaleChangeController {
 
+	@Autowired
+	private PurchaseOrderChangeService purchaseOrderChangeService;
+
+	@Autowired
+	private PurchaseChangeService purchaseChangeService;
+
+	/**
+	 * 作为卖家，收到的采购变更单
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public Page<PurchaseChange> getReceivedPurchaseOrderChanges(PageParams params) {
+		PageInfo info = new PageInfo(params);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
+		return purchaseChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findAllByPageInfo(info));
+	}
+
+	/**
+	 * 作为卖家，根据变更单ID查找采购变更单(含明细)
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@ResponseBody
+	public PurchaseChange getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
+		return purchaseChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findById(id));
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -3,7 +3,7 @@ package com.uas.platform.b2b.mobile.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -13,6 +13,7 @@ import com.uas.platform.b2b.mobile.service.PurchaseService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 /**
  * 对移动端的数据接口<br>
@@ -37,13 +38,25 @@ public class SaleController {
 	 * @param json
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.POST)
+	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<Purchase> getReceivedPurchaseOrders(@RequestBody String json) {
-		PageInfo info = new PageInfo(json);
+	public Page<Purchase> getReceivedPurchaseOrders(PageParams params) {
+		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		return purchaseService.convertPurchaseOrder(purchaseOrderService.findAllDetailByPageInfo(info));
 	}
 
+	/**
+	 * 作为卖家，根据采购单据ID查找采购订单(含明细)
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@ResponseBody
+	public Purchase getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
+		return purchaseService.convertPurchaseOrder(purchaseOrderService.findById(id));
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/PurchaseChangeService.java

@@ -1,7 +1,26 @@
 package com.uas.platform.b2b.mobile.service;
 
+import org.springframework.data.domain.Page;
+
+import com.uas.platform.b2b.mobile.model.PurchaseChange;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+
 public interface PurchaseChangeService {
-	
-	
-	
+
+	/**
+	 * 平台的客户采购变更单，转成移动端的采购变更单
+	 * 
+	 * @param orderPage
+	 * @return
+	 */
+	public Page<PurchaseChange> convertPurchaseOrderChange(Page<PurchaseOrderChange> orderPage);
+
+	/**
+	 * 平台的客户采购变更单，转成移动端的采购变更单
+	 * 
+	 * @param order
+	 * @return
+	 */
+	public PurchaseChange convertPurchaseOrderChange(PurchaseOrderChange order);
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/PurchaseService.java

@@ -15,4 +15,12 @@ public interface PurchaseService {
 	 */
 	public Page<Purchase> convertPurchaseOrder(Page<PurchaseOrderAll> orderPage);
 
+	/**
+	 * 平台的客户采购订单，转成移动端的采购订单
+	 * 
+	 * @param order
+	 * @return
+	 */
+	public Purchase convertPurchaseOrder(PurchaseOrderAll order);
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/PurchaseServiceImpl.java

@@ -131,4 +131,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 		return purchasePage;
 	}
 
+	@Override
+	public Purchase convertPurchaseOrder(PurchaseOrderAll order) {
+		return new Purchase(order);
+	}
+
 }

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

@@ -75,7 +75,7 @@ public interface PurchaseOrderChangeService {
 	 * @return
 	 */
 	public Page<PurchaseOrderChange> findAllByPageInfo(PageInfo pageInfo);
-	
+
 	/**
 	 * 回复单个明细
 	 * 
@@ -83,4 +83,12 @@ public interface PurchaseOrderChangeService {
 	 */
 	public void reply(PurchaseOrderChange change);
 
+	/**
+	 * 用变更单ID查找变更单
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public PurchaseOrderChange findById(Long id);
+
 }

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

@@ -204,4 +204,9 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		}
 	}
 
+	@Override
+	public PurchaseOrderChange findById(Long id) {
+		return purchaseOrderChangeDao.findOne(id);
+	}
+
 }