Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -263,6 +263,18 @@ public class PurchaseInquiryItem {
 	@Column(name = "id_needquantity")
 	private Double needquantity;
 
+    /**
+     * erp传输状态
+     *
+     * <pre>erp发出数据传输请求时，赋给状态，完成后更新状态</pre>
+     *
+     * 1、 传输完成<br>
+     * 0、 正在传输
+     *
+     */
+	@Column(name = "id_erpstatus")
+    private Short erpstatus;
+
 	public Long getId() {
 		return id;
 	}
@@ -569,7 +581,15 @@ public class PurchaseInquiryItem {
 		this.invalid = invalid;
 	}
 
-	/**
+    public Short getErpstatus() {
+        return erpstatus;
+    }
+
+    public void setErpstatus(Short erpstatus) {
+        this.erpstatus = erpstatus;
+    }
+
+    /**
 	 * 回复记录的描述
 	 * 
 	 * @return
@@ -607,7 +627,7 @@ public class PurchaseInquiryItem {
 		}
 		return this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
 				&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
-				&& this.agreed == null);
+				&& this.agreed == null) || this.erpstatus != Constant.NO;
 	}
 
     public static List<PurchaseInquiry> distinct(List<PurchaseInquiryItem> purcitems) {

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

@@ -332,6 +332,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 
 	@Override
 	public List<PurchaseInquiryItem> findNotUploadReply() {
+        purchaseInquiryItemDao.updateStatus(SystemSession.getUser().getEnterprise().getUu(), Constant.NO);
 		return purchaseInquiryItemDao.findByEnUUAndBackStatus(SystemSession.getUser().getEnterprise().getUu(),
 				(short) Status.NOT_UPLOAD.value());
 	}