模具询价单invalid字段get方法修改，将已过期的也放到已失效中；采购单，增加根据订单验收数量和订单数量加验退数量比较，确定单据是否已结案。

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryMouldSimpleInfo.java

@@ -157,6 +157,11 @@ public class PurchaseInquiryMouldSimpleInfo {
 	}
 
 	public Short getValid() {
+		// valid 1为有效，0为已作废。因为已作废和已过期要合并，
+		// 所以是已过期时，直接返回0，不是才根据valid值判断
+		if (this.getOverdue() == 1 && this.status == 200) {
+			return 0;
+		}
 		return valid;
 	}
 

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderItemSimpleInfo.java

@@ -22,6 +22,24 @@ public class PurchaseOrderItemSimpleInfo {
 	@Column(name = "pd_id")
 	private Long id;
 
+	/**
+	 * 数量 （数量用于判断是否为待交货）
+	 */
+	@Column(name = "pd_qty")
+	private Double qty;
+
+	/**
+	 * 客户已验收数量
+	 */
+	@Column(name = "pd_acceptqty")
+	private Double acceptQty;
+
+	/**
+	 * 客户验退数量
+	 */
+	@Column(name = "pd_returnqty")
+	private Double returnQty;
+
 	/**
 	 * 产品
 	 */
@@ -48,6 +66,39 @@ public class PurchaseOrderItemSimpleInfo {
 		return product;
 	}
 
+	public Double getQty() {
+		if (null == qty) {
+			return (double) 0;
+		}
+		return qty;
+	}
+
+	public void setQty(Double qty) {
+		this.qty = qty;
+	}
+
+	public Double getAcceptQty() {
+		if (null == acceptQty) {
+			return (double) 0;
+		}
+		return acceptQty;
+	}
+
+	public void setAcceptQty(Double acceptQty) {
+		this.acceptQty = acceptQty;
+	}
+
+	public Double getReturnQty() {
+		if (null == returnQty) {
+			return (double) 0;
+		}
+		return returnQty;
+	}
+
+	public void setReturnQty(Double returnQty) {
+		this.returnQty = returnQty;
+	}
+
 	public void setProduct(ProductSimpleInfo product) {
 		this.product = product;
 	}
@@ -62,8 +113,8 @@ public class PurchaseOrderItemSimpleInfo {
 
 	@Override
 	public String toString() {
-		return "PurchaseOrderItemSimpleInfo [id=" + id + ", product=" + product + ", purchaseOrder=" + purchaseOrder
-				+ "]";
+		return "PurchaseOrderItemSimpleInfo [id=" + id + ", qty=" + qty + ", acceptQty=" + acceptQty + ", returnQty="
+				+ returnQty + ", product=" + product + ", purchaseOrder=" + purchaseOrder + "]";
 	}
 
 }

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderSimpleInfo.java

@@ -15,6 +15,8 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
+
 /**
  * 平台里面，以供应商的角度来查看采购订单
  * 
@@ -192,6 +194,17 @@ public class PurchaseOrderSimpleInfo {
 	}
 
 	public Short getEnd() {
+		if (0 == end || null == end) { // 不是已结案状态时，根据数量判断是否是待交货
+			List<PurchaseOrderItemSimpleInfo> infos = new ArrayList<>();
+			for (PurchaseOrderItemSimpleInfo itemSimpleInfo : this.getOrderItems()) {
+				if (itemSimpleInfo.getAcceptQty() < itemSimpleInfo.getQty() + itemSimpleInfo.getReturnQty()) {
+					infos.add(itemSimpleInfo);// 有待交货的，就添加到List中
+				}
+			}
+			if (CollectionUtils.isEmpty(infos)) { // 没有待交货的明细时，判断为已结案。
+				return 1;
+			}
+		}
 		return end;
 	}