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

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -16,13 +16,19 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.PurchaseReply;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
 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;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
+/**
+ * 卖家对订单的操作
+ * 
+ * @author Administrator
+ * 
+ */
 @Controller
 @RequestMapping("/sale")
 public class SaleOrderController {
@@ -44,7 +50,7 @@ public class SaleOrderController {
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		return purchaseOrderService.findAllByPageInfo(info);
 	}
-	
+
 	/**
 	 * 作为卖家，根据采购单据ID查找采购订单(含明细)
 	 * 
@@ -81,25 +87,26 @@ public class SaleOrderController {
 	 */
 	@RequestMapping(value = "/orders/items/{orderItemId}/reply", method = RequestMethod.POST)
 	public ResponseEntity<String> replyOrderItem(@RequestBody String json, @PathVariable("orderItemId") Long orderItemId) {
-		PurchaseReply reply = FlexJsonUtils.fromJson(json, PurchaseReply.class);
+		PurchaseOrderReply reply = FlexJsonUtils.fromJson(json, PurchaseOrderReply.class);
 		PurchaseOrderItem orderItem = new PurchaseOrderItem();
 		orderItem.setId(orderItemId);
 		reply.setOrderItem(orderItem);
 		purchaseOrderService.reply(reply);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 作为卖家，查看我的回复
 	 * 
-	 * @param orderItemId 订单明细行ID
+	 * @param orderItemId
+	 *            订单明细行ID
 	 * @return
 	 */
 	@RequestMapping(value = "/orders/items/{orderItemId}/reply", method = RequestMethod.GET)
-	public List<PurchaseReply> getPurchaseReply(@PathVariable("orderItemId") Long orderItemId) {
+	public List<PurchaseOrderReply> getPurchaseReply(@PathVariable("orderItemId") Long orderItemId) {
 		return purchaseOrderService.findReplyByOrderItem(orderItemId);
 	}
-	
+
 	/**
 	 * 作为卖家，批量回复采购订单
 	 * 

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

@@ -8,10 +8,10 @@ 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.PurchaseReply;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
 
 @Repository
-public interface PurchaseReplyDao extends JpaSpecificationExecutor<PurchaseReply>, JpaRepository<PurchaseReply, Long> {
+public interface PurchaseReplyDao extends JpaSpecificationExecutor<PurchaseOrderReply>, JpaRepository<PurchaseOrderReply, Long> {
 	
 	/**
 	 * 按订单明细状态查找订单明细
@@ -20,6 +20,6 @@ public interface PurchaseReplyDao extends JpaSpecificationExecutor<PurchaseReply
 	 * @return
 	 */
 	@Query("from PurchaseReply r where r.orderItem.id = :orderItemId")
-	public List<PurchaseReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
+	public List<PurchaseOrderReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
 
 }

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

@@ -0,0 +1,49 @@
+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.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.erp.model.Purchase;
+import com.uas.platform.b2b.erp.service.PurchaseService;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.service.PurchaseOrderService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+
+/**
+ * 对买家ERP的数据接口<br>买家订单处理
+ * 
+ * @author yingp
+ * 
+ */
+@Controller
+@RequestMapping("/erp/purchase")
+public class PurchaseController {
+	
+	@Autowired
+	private PurchaseService purchaseService;
+	
+	@Autowired
+	private PurchaseOrderService purchaseOrderService;
+
+	/**
+	 * 保存、修改供应商信息
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public List<PurchaseOrderAll> savePurchases(@RequestBody String json) {
+		List<Purchase> purchases = FlexJsonUtils.fromJsonArray(json, Purchase.class);
+		return purchaseOrderService.save(purchaseService.convertPurchase(purchases));
+	}
+	
+	
+
+}

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

@@ -0,0 +1,11 @@
+package com.uas.platform.b2b.erp.model;
+
+/**
+ * ERP系统的采购订单
+ * 
+ * @author yingp
+ * 
+ */
+public class Purchase {
+
+}

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

@@ -0,0 +1,11 @@
+package com.uas.platform.b2b.erp.model;
+
+/**
+ * ERP系统的采购订单明细
+ * 
+ * @author yingp
+ * 
+ */
+public class PurchaseDetail {
+
+}

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

@@ -0,0 +1,11 @@
+package com.uas.platform.b2b.erp.model;
+
+/**
+ * ERP系统的采购订单明细回复记录
+ * 
+ * @author yingp
+ * 
+ */
+public class PurchaseReply {
+
+}

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

@@ -0,0 +1,21 @@
+package com.uas.platform.b2b.erp.service;
+
+import java.util.List;
+
+import com.uas.platform.b2b.erp.model.Purchase;
+import com.uas.platform.b2b.erp.model.PurchaseReply;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+
+public interface PurchaseService {
+
+	/**
+	 * 将ERP系统的采购订单，转为平台的订单
+	 * 
+	 * @param purchases
+	 * @return
+	 */
+	List<PurchaseOrderAll> convertPurchase(List<Purchase> purchases);
+	
+//	List<PurchaseReply> 
+
+}

src/main/java/com/uas/platform/b2b/model/PurchaseReply.java → src/main/java/com/uas/platform/b2b/model/PurchaseOrderReply.java

@@ -24,7 +24,7 @@ import javax.persistence.Table;
  */
 @Table(name = "purc$reply")
 @Entity
-public class PurchaseReply implements Serializable {
+public class PurchaseOrderReply implements Serializable {
 
 	/**
 	 * 

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

@@ -6,11 +6,19 @@ import org.springframework.data.domain.Page;
 
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseReply;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
 import com.uas.platform.core.model.PageInfo;
 
 public interface PurchaseOrderService {
 
+	/**
+	 * 批量保存、修改采购订单
+	 * 
+	 * @param orders
+	 * @return
+	 */
+	public List<PurchaseOrderAll> save(List<PurchaseOrderAll> orders);
+
 	/**
 	 * 分页查找订单
 	 * 
@@ -48,7 +56,7 @@ public interface PurchaseOrderService {
 	 * 
 	 * @param reply
 	 */
-	public void reply(PurchaseReply reply);
+	public void reply(PurchaseOrderReply reply);
 
 	/**
 	 * 批量回复
@@ -65,6 +73,6 @@ public interface PurchaseOrderService {
 	 *            订单明细ID
 	 * @return
 	 */
-	public List<PurchaseReply> findReplyByOrderItem(long orderItemId);
+	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId);
 
 }

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

@@ -21,7 +21,7 @@ import com.uas.platform.b2b.dao.PurchaseReplyDao;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.PurchaseReply;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.NotFoundException;
@@ -42,6 +42,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
+	
+	public List<PurchaseOrderAll> save(List<PurchaseOrderAll> orders) {
+		return purchaseOrderAllDao.save(orders);
+	}
 
 	public Page<PurchaseOrder> findAllByPageInfo(final PageInfo pageInfo) {
 		return purchaseOrderDao.findAll(new Specification<PurchaseOrder>() {
@@ -66,7 +70,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	@Transactional
-	public void reply(PurchaseReply reply) {
+	public void reply(PurchaseOrderReply reply) {
 		reply.setDate(new Date());
 		// 作为B2B->ERP数据是否已传输的标志
 		reply.setStatus((short) Status.NOT_UPLOAD.value());
@@ -110,20 +114,20 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		PurchaseOrderItem orderItem;
 		for (String orderItemId : orderItemIdString) {
 			orderItem = purchaseOrderItemDao.findOne(Long.parseLong(orderItemId));
-			PurchaseReply purchaseReply = new PurchaseReply();
-			purchaseReply.setOrderItem(orderItem);
-			purchaseReply.setDelivery(orderItem.getDelivery());
-			purchaseReply.setRemark("批量回复");
+			PurchaseOrderReply reply = new PurchaseOrderReply();
+			reply.setOrderItem(orderItem);
+			reply.setDelivery(orderItem.getDelivery());
+			reply.setRemark("批量回复");
 			if (orderItem.getReplyQty() == null)
 				orderItem.setReplyQty((double) 0);
-			purchaseReply.setQty(orderItem.getQty() - orderItem.getReplyQty());
-			reply(purchaseReply);
+			reply.setQty(orderItem.getQty() - orderItem.getReplyQty());
+			reply(reply);
 		}
 
 	}
 
 	@Override
-	public List<PurchaseReply> findReplyByOrderItem(long orderItemId) {
+	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId) {
 		return purchaseReplyDao.findByOrderItemId(orderItemId);
 	}