Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b into debug-power

src/main/java/com/uas/platform/b2b/erp/model/AcceptNotify.java

@@ -1,16 +1,12 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.collections.CollectionUtils;
-
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.*;
 
 /**
  * 买家ERP的收料通知单
@@ -26,6 +22,7 @@ public class AcceptNotify {
 	private String an_remark;
 	private String an_sendcode;
 	private String an_recorder;
+	private Date an_date;
 	private List<AcceptNotifyDetail> details;
 
 	public Long getB2b_ss_id() {
@@ -60,6 +57,18 @@ public class AcceptNotify {
 		this.an_rate = an_rate;
 	}
 
+	public void setAn_venduu(long an_venduu) {
+		this.an_venduu = an_venduu;
+	}
+
+	public Date getAn_date() {
+		return an_date;
+	}
+
+	public void setAn_date(Date an_date) {
+		this.an_date = an_date;
+	}
+
 	public String getAn_payment() {
 		return an_payment;
 	}
@@ -127,6 +136,7 @@ public class AcceptNotify {
 		this.an_venduu = send.getEnUU();
 		this.an_sendcode = send.getCode();
 		this.an_recorder = send.getRecorder();
+		this.an_date = send.getDate();
 		this.details = new ArrayList<AcceptNotifyDetail>();
 		if (!CollectionUtils.isEmpty(send.getSendItems())) {
 			for (SaleSendItem item : send.getSendItems()) {