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

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

@@ -9,15 +9,16 @@ import org.springframework.stereotype.Repository;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 
 @Repository
-public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOrderAll>,
-		JpaRepository<PurchaseOrderAll, Long> {
+public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOrderAll>, JpaRepository<PurchaseOrderAll, Long> {
 
 	/**
+	 * @param vendUU
+	 *            卖方企业ID
 	 * @param code
 	 *            订单号
 	 * @return
 	 */
-	public List<PurchaseOrderAll> findByCode(String code);
+	public List<PurchaseOrderAll> findByVendUUAndCode(long vendUU, String code);
 
 	/**
 	 * @param id

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

@@ -83,8 +83,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (item.getReplyQty() > item.getQty())
 			throw new IllegalOperatorException("回复的数量合计超过了订单数量");
 		// 该行回复状态
-		item.setStatus((short) (Double.compare(item.getReplyQty(), item.getQty()) == 0 ? Status.REPLIED.value()
-				: Status.NOT_REPLY.value()));
+		item.setStatus((short) (Double.compare(item.getReplyQty(), item.getQty()) == 0 ? Status.REPLIED.value() : Status.NOT_REPLY.value()));
 		purchaseOrderReplyDao.save(reply);
 		purchaseOrderItemDao.save(item);
 		// 订单主记录状态
@@ -97,7 +96,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public PurchaseOrderAll findByCode(String code) {
-		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByCode(code);
+		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
+				code);
 		if (purchaseOrderAlls.size() == 0)
 			throw new NotFoundException(code);
 		return purchaseOrderAlls.get(0);
@@ -135,7 +135,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public List<PurchaseOrderReply> findNotUploadReply() {
-		return purchaseOrderReplyDao.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_UPLOAD.value());
+		return purchaseOrderReplyDao
+				.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_UPLOAD.value());
 	}
 
 }