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

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

@@ -25,6 +25,7 @@ public class AcceptNotify {
 	private long an_buyeruu;
 	private String an_remark;
 	private String an_sendcode;
+	private String an_recorder;
 	private List<AcceptNotifyDetail> details;
 
 	public Long getB2b_ss_id() {
@@ -99,6 +100,14 @@ public class AcceptNotify {
 		this.an_sendcode = an_sendcode;
 	}
 
+	public String getAn_recorder() {
+		return an_recorder;
+	}
+
+	public void setAn_recorder(String an_recorder) {
+		this.an_recorder = an_recorder;
+	}
+
 	public AcceptNotify() {
 
 	}
@@ -117,6 +126,7 @@ public class AcceptNotify {
 		this.an_remark = send.getRemark();
 		this.an_venduu = send.getEnUU();
 		this.an_sendcode = send.getCode();
+		this.an_recorder = send.getRecorder();
 		this.details = new ArrayList<AcceptNotifyDetail>();
 		if (!CollectionUtils.isEmpty(send.getSendItems())) {
 			for (SaleSendItem item : send.getSendItems()) {
@@ -141,6 +151,7 @@ public class AcceptNotify {
 		send.setRemark(this.an_remark);
 		send.setSendStatus((short) Status.DOWNLOADED.value());
 		send.setBackStatus((short) Status.NOT_UPLOAD.value());
+		send.setRecorder(this.an_recorder);
 		send.setCode(this.an_sendcode == null ? String.valueOf(System.currentTimeMillis()) : this.an_sendcode);
 		Set<SaleSendItem> items = new HashSet<SaleSendItem>();
 		if (!CollectionUtils.isEmpty(details)) {

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

@@ -16,7 +16,7 @@ public class AcceptNotifyDetail {
 
 	private String and_ordercode;
 	private Short and_orderdetno;
-	private Long pn_id;
+	private Long and_pnid;
 	private Double and_inqty;
 	private Double and_price;
 	private String and_remark;
@@ -70,12 +70,12 @@ public class AcceptNotifyDetail {
 		this.and_price = and_price;
 	}
 
-	public Long getPn_id() {
-		return pn_id;
+	public Long getAnd_pnid() {
+		return and_pnid;
 	}
 
-	public void setPn_id(Long pn_id) {
-		this.pn_id = pn_id;
+	public void setAnd_pnid(Long and_pnid) {
+		this.and_pnid = and_pnid;
 	}
 
 	public AcceptNotifyDetail() {
@@ -87,6 +87,7 @@ public class AcceptNotifyDetail {
 	public AcceptNotifyDetail(SaleSendItem item) {
 		this.and_detno = item.getNumber();
 		this.and_inqty = item.getQty();
+		this.and_pnid = item.getNotice().getSourceId();
 		this.and_ordercode = item.getNotice().getOrderItem().getOrder().getCode();
 		this.and_orderdetno = item.getNotice().getOrderItem().getNumber();
 		this.and_price = item.getPrice();
@@ -111,7 +112,7 @@ public class AcceptNotifyDetail {
 		orderItem.setOrder(order);
 		PurchaseNotice notice = new PurchaseNotice();
 		notice.setOrderItem(orderItem);
-		notice.setSourceId(this.pn_id);
+		notice.setSourceId(this.and_pnid);
 		notice.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		item.setNotice(notice);
 		return item;

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

@@ -21,21 +21,23 @@ import com.uas.platform.core.model.Status;
 public class SaleOut {
 
 	private Long b2b_ss_id;
-	private String pi_inuotno;
+	private String pi_inoutno;
 	private String pi_currency;
 	private Float pi_rate;
 	private long cu_uu;
 	private long cu_contactuu;
 	private String pi_payments;
 	private String pi_remark;
+	private String pi_recordman;
+	private String pi_auditman;
 	private List<SaleOutDetail> details;
 
-	public String getPi_inuotno() {
-		return pi_inuotno;
+	public String getPi_inoutno() {
+		return pi_inoutno;
 	}
 
-	public void setPi_inuotno(String pi_inuotno) {
-		this.pi_inuotno = pi_inuotno;
+	public void setPi_inoutno(String pi_inoutno) {
+		this.pi_inoutno = pi_inoutno;
 	}
 
 	public long getCu_uu() {
@@ -102,6 +104,22 @@ public class SaleOut {
 		this.pi_remark = pi_remark;
 	}
 
+	public String getPi_recordman() {
+		return pi_recordman;
+	}
+
+	public void setPi_recordman(String pi_recordman) {
+		this.pi_recordman = pi_recordman;
+	}
+
+	public String getPi_auditman() {
+		return pi_auditman;
+	}
+
+	public void setPi_auditman(String pi_auditman) {
+		this.pi_auditman = pi_auditman;
+	}
+
 	public SaleOut() {
 	}
 
@@ -123,7 +141,7 @@ public class SaleOut {
 	public SaleSend convert() {
 		SaleSend send = new SaleSend();
 		send.setBackStatus((short) Status.DOWNLOADED.value());
-		send.setCode(this.pi_inuotno);
+		send.setCode(this.pi_inoutno);
 		send.setCurrency(this.pi_currency);
 		send.setCustUserUU(this.cu_contactuu);
 		send.setCustUU(this.cu_uu);

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

@@ -84,6 +84,12 @@ public class SaleSend implements Serializable {
 	 */
 	@Column(name = "ss_remark")
 	private String remark;
+	
+	/**
+	 * 录单人
+	 */
+	@Column(name = "ss_recorder")
+	private String recorder;
 
 	/**
 	 * 发货明细
@@ -200,4 +206,12 @@ public class SaleSend implements Serializable {
 		this.backStatus = backStatus;
 	}
 
+	public String getRecorder() {
+		return recorder;
+	}
+
+	public void setRecorder(String recorder) {
+		this.recorder = recorder;
+	}
+
 }