【商务平台】 判断是否存在未对账时，以来源表和来源表id进行判断是否存在未对账的单据

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

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

@@ -119,10 +119,11 @@ public class SaleApCheckController {
 		PurchaseApCheck apCheck = FlexJsonUtils.fromJson(json, PurchaseApCheck.class);
 		if (apCheck != null) {
 			for (PurchaseApCheckItem item : apCheck.getItems()) {
-				List<PurchaseApCheckItem> items = purchaseApCheckService.findByOrderCode(item.getOrderCode());
+				List<PurchaseApCheckItem> items = purchaseApCheckService
+						.findBySourceTableAndSourceId(item.getSourceTable(), item.getSourceId());
 				for (PurchaseApCheckItem newitem : items) {
 					if (newitem.getApCheck().getCheckStatus().equals("未对账")) {
-						throw new IllegalOperatorException("该订单存在未对账的单据，请先对账！");
+						throw new IllegalOperatorException("订单" + item.getInoutno() + "存在未对账的单据，请先对账！");
 					}
 				}
 			}

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

@@ -25,10 +25,11 @@ public interface PurchaseApCheckItemDao
 	public List<PurchaseApCheckItem> findByIdAndNumber(@Param("id") Long id, @Param("number") Integer number);
 
 	/**
-	 * 按sourceid判断是否已提交
+	 * 通过sourceTable、sourceId判断是否已提交未对账
 	 * 
-	 * @param sourceid
+	 * @param sourceTable
+	 * @param sourceId
 	 * @return
 	 */
-	public List<PurchaseApCheckItem> findByOrderCode(String OrderCode);
+	public List<PurchaseApCheckItem> findBySourceTableAndSourceId(String sourceTable, Long sourceId);
 }

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

@@ -120,10 +120,11 @@ public interface PurchaseApCheckService {
 	public void print(Long id);
 
 	/**
-	 * 通过sourceid查询状态进行判断是否提交
+	 * 通过sourceTable和sourceId判断是否存在未对账的单据
 	 * 
+	 * @param sourceTable
 	 * @param sourceId
 	 * @return
 	 */
-	public List<PurchaseApCheckItem> findByOrderCode(String OrderCode);
+	public List<PurchaseApCheckItem> findBySourceTableAndSourceId(String sourceTable, Long sourceId);
 }

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

@@ -421,7 +421,7 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 	}
 
 	@Override
-	public List<PurchaseApCheckItem> findByOrderCode(String orderCode) {
-		return purchaseApCheckItemDao.findByOrderCode(orderCode);
+	public List<PurchaseApCheckItem> findBySourceTableAndSourceId(String sourceTable, Long sourceId) {
+		return purchaseApCheckItemDao.findBySourceTableAndSourceId(sourceTable, sourceId);
 	}
 }