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

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

@@ -11,10 +11,11 @@ import org.springframework.stereotype.Repository;
 import com.uas.platform.b2b.model.PurchaseOrderReply;
 
 @Repository
-public interface PurchaseReplyDao extends JpaSpecificationExecutor<PurchaseOrderReply>, JpaRepository<PurchaseOrderReply, Long> {
-	
+public interface PurchaseOrderReplyDao extends JpaSpecificationExecutor<PurchaseOrderReply>,
+		JpaRepository<PurchaseOrderReply, Long> {
+
 	/**
-	 * 按订单明细状态查找订单明细
+	 * 按订单明细ID查找订单明细回复
 	 * 
 	 * @param orderItemId
 	 * @return
@@ -22,4 +23,11 @@ public interface PurchaseReplyDao extends JpaSpecificationExecutor<PurchaseOrder
 	@Query("from PurchaseReply r where r.orderItem.id = :orderItemId")
 	public List<PurchaseOrderReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
 
+	/**
+	 * 按回复记录的状态查找回复记录
+	 * 
+	 * @param status
+	 * @return
+	 */
+	public List<PurchaseOrderReply> findByStatus(short status);
 }

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

@@ -10,6 +10,7 @@ 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.model.PurchaseReply;
 import com.uas.platform.b2b.erp.service.PurchaseService;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.service.PurchaseOrderService;
@@ -44,6 +45,16 @@ public class PurchaseController {
 		return purchaseOrderService.save(purchaseService.convertPurchase(purchases));
 	}
 	
-	
+	/**
+	 * 保存、修改供应商信息
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/reply", method = RequestMethod.GET)
+	@ResponseBody
+	public List<PurchaseReply> getReply() {
+		return purchaseService.convertPurchaseOrderReply(purchaseOrderService.findNotUploadReply());
+	}
 
 }

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

@@ -5,6 +5,7 @@ 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;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
 
 public interface PurchaseService {
 
@@ -15,7 +16,13 @@ public interface PurchaseService {
 	 * @return
 	 */
 	List<PurchaseOrderAll> convertPurchase(List<Purchase> purchases);
-	
-//	List<PurchaseReply> 
+
+	/**
+	 * 将平台的订单回复。转为ERP的回复
+	 * 
+	 * @param replies
+	 * @return
+	 */
+	List<PurchaseReply> convertPurchaseOrderReply(List<PurchaseOrderReply> replies);
 
 }

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

@@ -75,4 +75,10 @@ public interface PurchaseOrderService {
 	 */
 	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId);
 
+	/**
+	 * 查找所有待上传的回复记录
+	 * 
+	 * @return
+	 */
+	public List<PurchaseOrderReply> findNotUploadReply();
 }

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

@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
-import com.uas.platform.b2b.dao.PurchaseReplyDao;
+import com.uas.platform.b2b.dao.PurchaseOrderReplyDao;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
@@ -38,11 +38,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	private PurchaseOrderAllDao purchaseOrderAllDao;
 
 	@Autowired
-	private PurchaseReplyDao purchaseReplyDao;
+	private PurchaseOrderReplyDao purchaseOrderReplyDao;
 
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
-	
+
 	public List<PurchaseOrderAll> save(List<PurchaseOrderAll> orders) {
 		return purchaseOrderAllDao.save(orders);
 	}
@@ -83,7 +83,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		// 该行回复状态
 		item.setStatus((short) (Double.compare(item.getReplyQty(), item.getQty()) == 0 ? Status.REPLIED.value()
 				: Status.NOT_REPLY.value()));
-		purchaseReplyDao.save(reply);
+		purchaseOrderReplyDao.save(reply);
 		purchaseOrderItemDao.save(item);
 		// 订单主记录状态
 		List<PurchaseOrderItem> notReply = purchaseOrderItemDao.findByOrderIdAndStatus(item.getOrder().getId(),
@@ -128,7 +128,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId) {
-		return purchaseReplyDao.findByOrderItemId(orderItemId);
+		return purchaseOrderReplyDao.findByOrderItemId(orderItemId);
+	}
+
+	@Override
+	public List<PurchaseOrderReply> findNotUploadReply() {
+		return purchaseOrderReplyDao.findByStatus((short) Status.NOT_UPLOAD.value());
 	}
 
 }