Browse Source

修复对账提交后,可用的最大对账数不改变的bug

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@5698 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
0098bb4b5a

+ 7 - 6
src/main/java/com/uas/platform/b2b/model/SourceForApcheck.java

@@ -2,20 +2,21 @@ package com.uas.platform.b2b.model;
 
 /**
  * 这个模型 记录出入库来源单信息
+ * 
  * @author aof
  * @time 创建时间:2016年5月26日
  */
 public class SourceForApcheck {
-	
+
 	private Long sourceId;
 	private String sourceTable;
 	private Double newYCheckQty;
-	
+
 	public SourceForApcheck(PurchaseApCheckItem item) {
 		super();
 		this.sourceId = item.getSourceId();
 		this.sourceTable = item.getSourceTable();
-		this.newYCheckQty = item.getCheckQty();
+		this.newYCheckQty = item.getCheckQty() + item.getOldYCheckQty();
 	}
 
 	public Long getSourceId() {
@@ -43,16 +44,16 @@ public class SourceForApcheck {
 	}
 
 	public boolean hasInfo() {
-		if(this.getNewYCheckQty() != null && this.getSourceId() != null && this.getSourceTable() != null) {
+		if (this.getNewYCheckQty() != null && this.getSourceId() != null && this.getSourceTable() != null) {
 			return true;
 		}
 		return false;
 	}
-	
+
 	@Override
 	public String toString() {
 		return "SourceForApcheck [sourceId=" + sourceId + ", sourceTable=" + sourceTable + ", newYCheckQty="
 				+ newYCheckQty + "]";
 	}
-	
+
 }

+ 21 - 18
src/main/java/com/uas/platform/b2b/service/PurchaseApCheckService.java

@@ -14,13 +14,13 @@ import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.core.model.PageInfo;
 
 public interface PurchaseApCheckService {
-	
+
 	/**
 	 * 获取需要上传到供应商ERP的客户委外订单
+	 * 
 	 * @return
 	 */
 	public List<PurchaseApCheck> findNotUploadAPcheck();
-	
 
 	/**
 	 * 平台的应收对账传到供应商ERP之后,修改平台里面的订单的上传状态
@@ -28,7 +28,7 @@ public interface PurchaseApCheckService {
 	 * @param idArray
 	 */
 	public void onApCheckSuccess(String[] idArray);
-	
+
 	/**
 	 * 批量保存应收对账单
 	 * 
@@ -36,20 +36,19 @@ public interface PurchaseApCheckService {
 	 * @return
 	 */
 	public void saveApChecks(List<PurchaseApCheckItem> checkItems);
-	
-	
+
 	/**
 	 * 作废应收对账单
+	 * 
 	 * @param id
 	 */
 	public boolean cancelApcheck(Long id);
-	
 
 	/**
 	 * 保存生成的应收对账单主记录
 	 */
 	public PurchaseApCheck save(PurchaseApCheck purchaseApCheck);
-	
+
 	/**
 	 * 根据ID获取生成的应收对账单
 	 * 
@@ -57,61 +56,65 @@ public interface PurchaseApCheckService {
 	 * @return
 	 */
 	public PurchaseApCheck findById(Long id);
-	
+
 	/**
-	 * 根据来源表的ID更新来源单据已转数 
+	 * 根据来源表的ID更新来源单据已转数
 	 */
 	public void updateYCheckQty(List<HashMap<String, Object>> list);
-	
+
 	/**
-	 * 删除新生成的应收对账单 
+	 * 删除新生成的应收对账单
 	 */
 	public void deleteApCheck(Long id);
-	
+
 	/**
 	 * 提交生成的应收对账单
 	 */
 	public boolean updateApCheckStatus(Long id);
-	
-	
+
 	/**
 	 * 分页查找应收对账单,包括明细(全部)
+	 * 
 	 * @param pageInfo
 	 * @param keyword
 	 *            查找关键字
 	 * @return
 	 */
 	public Page<PurchaseApCheck> findAllByPageInfo(PageInfo pageInfo, String keyword, SearchFilter searchFilter);
-	
+
 	/**
 	 * 分页查找应收对账单,包括明细(全部)
+	 * 
 	 * @param pageInfo
 	 * @param keyword
 	 *            查找关键字
 	 * @return
 	 */
 	public Page<PurchaseApCheckTodo> findTodoByPageInfo(PageInfo pageInfo, String keyword, SearchFilter searchFilter);
-	
+
 	/**
 	 * 分页查找应收对账单,包括明细(已确认)
+	 * 
 	 * @param pageInfo
 	 * @param keyword
 	 *            查找关键字
 	 * @return
 	 */
 	public Page<PurchaseApCheckDone> findDoneByPageInfo(PageInfo pageInfo, String keyword, SearchFilter searchFilter);
-	
+
 	/**
 	 * 分页查找应收对账单,包括明细(不同意 已作废 )
+	 * 
 	 * @param pageInfo
 	 * @param keyword
 	 *            查找关键字
 	 * @return
 	 */
 	public Page<PurchaseApCheckEnd> findEndByPageInfo(PageInfo pageInfo, String keyword, SearchFilter searchFilter);
-	
+
 	/**
 	 * 打印订单,订单打印此次 +1
+	 * 
 	 * @param id
 	 */
 	public void print(Long id);