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

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

@@ -10,7 +10,6 @@ import org.springframework.util.CollectionUtils;
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
 /**
@@ -141,8 +140,8 @@ public class PurchaseChange {
 		change.setSendStatus((short) Status.NOT_UPLOAD.value());
 		change.setStatus((short) Status.NOT_REPLY.value());
 		change.setAgreed(getPc_agreed());
-		if (this.pc_agreed != null && Constant.YES == getPc_agreed()) {
-			// 买家已同意的，无需再传到买家ERP
+		if (change.isAgreed()) {
+			// 买家已同意的，无需再传回到买家ERP
 			change.setStatus((short) Status.REPLIED.value());
 			change.setBackStatus((short) Status.DOWNLOADED.value());
 			// 买家已同意的，卖家ERP无需回复

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

@@ -0,0 +1,17 @@
+package com.uas.platform.b2b.mobile.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 对移动端的数据接口<br>
+ * 卖家对收到的客户采购变更单的处理
+ * 
+ * @author yingp
+ * 
+ */
+@Controller
+@RequestMapping("/mobile/sale/changes")
+public class SaleChangeController {
+
+}

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

@@ -0,0 +1,49 @@
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.mobile.model.Purchase;
+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;
+
+/**
+ * 对移动端的数据接口<br>
+ * 卖家对收到的客户采购单的处理
+ * 
+ * @author yingp
+ * 
+ */
+@Controller("mobile.SaleController")
+@RequestMapping("/mobile/sale/orders")
+public class SaleController {
+
+	@Autowired
+	private PurchaseOrderService purchaseOrderService;
+
+	@Autowired
+	private PurchaseService purchaseService;
+
+	/**
+	 * 作为卖家，查询收到的客户采购订单
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public Page<Purchase> getReceivedPurchaseOrders(@RequestBody String json) {
+		PageInfo info = new PageInfo(json);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		return purchaseService.convertPurchaseOrder(purchaseOrderService.findAllDetailByPageInfo(info));
+	}
+
+}

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

@@ -0,0 +1,7 @@
+package com.uas.platform.b2b.mobile.service;
+
+public interface PurchaseChangeService {
+	
+	
+	
+}

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

@@ -0,0 +1,18 @@
+package com.uas.platform.b2b.mobile.service;
+
+import org.springframework.data.domain.Page;
+
+import com.uas.platform.b2b.mobile.model.Purchase;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+
+public interface PurchaseService {
+
+	/**
+	 * 平台的客户采购订单，转成移动端的采购订单
+	 * 
+	 * @param orderPage
+	 * @return
+	 */
+	public Page<Purchase> convertPurchaseOrder(Page<PurchaseOrderAll> orderPage);
+
+}

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

@@ -0,0 +1,134 @@
+package com.uas.platform.b2b.mobile.service.impl;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.mobile.model.Purchase;
+import com.uas.platform.b2b.mobile.service.PurchaseService;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+
+@Service("mobile.PurchaseService")
+public class PurchaseServiceImpl implements PurchaseService {
+
+	@Override
+	public Page<Purchase> convertPurchaseOrder(final Page<PurchaseOrderAll> orderPage) {
+		Page<Purchase> purchasePage = new Page<Purchase>() {
+
+			@Override
+			public List<Purchase> getContent() {
+				List<Purchase> purchases = new ArrayList<Purchase>();
+				List<PurchaseOrderAll> orders = orderPage.getContent();
+				if (!CollectionUtils.isEmpty(orders)) {
+					for (PurchaseOrderAll order : orders) {
+						purchases.add(new Purchase(order));
+					}
+				}
+				return purchases;
+			}
+
+			@Override
+			public int getNumber() {
+				return orderPage.getNumber();
+			}
+
+			@Override
+			public int getNumberOfElements() {
+				return orderPage.getNumberOfElements();
+			}
+
+			@Override
+			public int getSize() {
+				return orderPage.getSize();
+			}
+
+			@Override
+			public Sort getSort() {
+				return orderPage.getSort();
+			}
+
+			@Override
+			public boolean hasContent() {
+				return orderPage.hasContent();
+			}
+
+			@Override
+			public boolean hasNext() {
+				return orderPage.hasNext();
+			}
+
+			@Override
+			public boolean hasPrevious() {
+				return orderPage.hasPrevious();
+			}
+
+			@Override
+			public boolean isFirst() {
+				return orderPage.isFirst();
+			}
+
+			@Override
+			public boolean isLast() {
+				return orderPage.isLast();
+			}
+
+			@Override
+			public Pageable nextPageable() {
+				return orderPage.nextPageable();
+			}
+
+			@Override
+			public Pageable previousPageable() {
+				return orderPage.previousPageable();
+			}
+
+			@Override
+			public Iterator<Purchase> iterator() {
+				return getContent().iterator();
+			}
+
+			@Override
+			public long getTotalElements() {
+				return orderPage.getTotalElements();
+			}
+
+			@Override
+			public int getTotalPages() {
+				return orderPage.getTotalPages();
+			}
+
+			@SuppressWarnings("deprecation")
+			@Override
+			public boolean hasNextPage() {
+				return orderPage.hasNextPage();
+			}
+
+			@SuppressWarnings("deprecation")
+			@Override
+			public boolean hasPreviousPage() {
+				return orderPage.hasPreviousPage();
+			}
+
+			@SuppressWarnings("deprecation")
+			@Override
+			public boolean isFirstPage() {
+				return orderPage.isFirstPage();
+			}
+
+			@SuppressWarnings("deprecation")
+			@Override
+			public boolean isLastPage() {
+				return orderPage.isLastPage();
+			}
+
+		};
+		return purchasePage;
+	}
+
+}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderChange.java

@@ -18,6 +18,8 @@ import javax.persistence.OrderBy;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
+import com.uas.platform.core.model.Constant;
+
 /**
  * 平台里面，以供应商的角度来查看采购订单变更单 <br>
  * 级联变更明细
@@ -299,4 +301,8 @@ public class PurchaseOrderChange implements Serializable {
 		this.orderId = orderId;
 	}
 
+	public boolean isAgreed() {
+		return this.agreed != null && Constant.YES == this.agreed;
+	}
+
 }

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

@@ -65,6 +65,9 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 							+ orderItem.getOrderChange().getCode() + ",客户:" + order.getEnterprise().getEnName());
 				}
 				orderId.add(orderItem.getOrderChange().getId());
+				// 买家直接批准变更，无需卖家确认的情况下，直接变更平台的客户采购单
+				if (orderItem.getOrderChange().isAgreed())
+					changeOrder(orderItem.getOrderChange());
 			}
 		}
 	}
@@ -193,10 +196,10 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		PurchaseOrder order = orderChange.getOrder();
 		if (order.getUserUU() != null) {
 			// Android
-			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购单回复", "单号:" + order.getCode() + ",供应商:"
+			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购变更单回复", "单号:" + order.getCode() + ",供应商:"
 					+ enterpriseDao.findOne(order.getVendUU()).getEnName());
 			// IOS
-			XingePusher.pushSingleAccountIOS(order.getUserUU().toString(), "新增采购单回复" + "单号:" + order.getCode() + ",供应商:"
+			XingePusher.pushSingleAccountIOS(order.getUserUU().toString(), "新增采购变更单回复" + "单号:" + order.getCode() + ",供应商:"
 					+ enterpriseDao.findOne(order.getVendUU()).getEnName());
 		}
 	}