商务平台接收到的erp数据记录对应的erpid；

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

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

@@ -15,34 +15,33 @@ import com.uas.platform.core.model.Status;
  * @author suntg
  * 
  */
-public class Make{
-
-	private Long ma_id;//id
-	private String ma_code;//委外编号
-	private Date ma_date;//单据日期
-	private String ma_tasktype;//单据类型
-	private Date ma_requiredate;//需求日期
-	private Long ve_uu;//供应商UU号
-	private String ma_prodcode;//物料编号
-	private Double ma_qty;//需求数量
-	private Double ma_makeqty;//已生产数
-	private String ma_kind;//工单类型
-	private Double ma_price;//加工单价
-	private Double ma_total;//加工金额
-	private String ma_currency;//币别
-	private Float ma_rate;//汇率
-	private Float ma_taxrate;//税率
-	private String ma_shipaddresscode;//收货地址
-	private String ma_payments;//付款方式
-	private String ma_recorder;//录入人
-	private Date ma_planbegindate;//计划开工日期
-	private Date ma_planenddate;//计划完工日期
-	private String ma_auditman;//审核人
-	private String ma_remark;//备注
-	private String ma_factory;//送货工厂
-	private List<MakeMaterial> materials;//用料明细
-
-	
+public class Make {
+
+	private Long ma_id;// id
+	private String ma_code;// 委外编号
+	private Date ma_date;// 单据日期
+	private String ma_tasktype;// 单据类型
+	private Date ma_requiredate;// 需求日期
+	private Long ve_uu;// 供应商UU号
+	private String ma_prodcode;// 物料编号
+	private Double ma_qty;// 需求数量
+	private Double ma_makeqty;// 已生产数
+	private String ma_kind;// 工单类型
+	private Double ma_price;// 加工单价
+	private Double ma_total;// 加工金额
+	private String ma_currency;// 币别
+	private Float ma_rate;// 汇率
+	private Float ma_taxrate;// 税率
+	private String ma_shipaddresscode;// 收货地址
+	private String ma_payments;// 付款方式
+	private String ma_recorder;// 录入人
+	private Date ma_planbegindate;// 计划开工日期
+	private Date ma_planenddate;// 计划完工日期
+	private String ma_auditman;// 审核人
+	private String ma_remark;// 备注
+	private String ma_factory;// 送货工厂
+	private List<MakeMaterial> materials;// 用料明细
+
 	public String getMa_factory() {
 		return ma_factory;
 	}
@@ -234,8 +233,8 @@ public class Make{
 	public void setMaterials(List<MakeMaterial> materials) {
 		this.materials = materials;
 	}
-	
-	public MakeOrder convert(){
+
+	public MakeOrder convert() {
 		MakeOrder make = new MakeOrder();
 		make.setAuditor(ma_auditman);
 		make.setCode(ma_code);
@@ -265,6 +264,7 @@ public class Make{
 		make.setReplyQty((double) 0);
 		make.setStatus((short) Status.NOT_REPLY.value());
 		make.setFactory(this.ma_factory);
+		make.setErpId(ma_id);
 		return make;
 	}
 

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

@@ -12,7 +12,7 @@ import com.uas.platform.b2b.model.MakeOrderChange;
 import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.support.SystemSession;
 
-public class MakeChange{
+public class MakeChange {
 
 	private Long mc_id;// id
 	private String mc_code;// 变更单号
@@ -96,7 +96,7 @@ public class MakeChange{
 	public void setChangeDetails(List<MakeChangeDetail> changeDetails) {
 		this.changeDetails = changeDetails;
 	}
-	
+
 	public MakeOrderChange convert() {
 		MakeOrderChange change = new MakeOrderChange();
 		change.setCode(mc_code);
@@ -107,9 +107,10 @@ public class MakeChange{
 		change.setUserUU(SystemSession.getUser().getUserUU());
 		change.setAuditDate(mc_auditdate);
 		change.setAuditMan(mc_auditman);
-		if(! CollectionUtils.isEmpty(changeDetails)) {
+		change.setErpId(mc_id);
+		if (!CollectionUtils.isEmpty(changeDetails)) {
 			Set<MakeOrderChangeItem> changeItems = new HashSet<MakeOrderChangeItem>();
-			for(MakeChangeDetail changeDetail : changeDetails) {
+			for (MakeChangeDetail changeDetail : changeDetails) {
 				changeItems.add(changeDetail.convert());
 			}
 			change.setOrderChangeItems(changeItems);

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

@@ -14,108 +14,144 @@ import com.uas.platform.b2b.model.MakeReturnItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 
-
 /**
  * 采购方角度ERP委外验收单
+ * 
  * @author aof
  * @date 2015年8月17日
  */
-public class MakeProdInOut{
-
-	private String pi_inoutno;//委外验收单号
-	private Long pi_vendoruu;//委外供应商uu号
-	private String pi_currency;//币别  
-	private Float pi_rate;//汇率  
-	private String pi_payment;//付款方式 
-	private String pi_transport;//运输方式 
-	private String pi_remark;//备注 
-	private String pi_inoutman;//过账人 
-	private Date pi_date;//过账日期  
-	private String pi_sendcode;//送货单号 
-	private String pi_receivecode;//应付供应商编号
-	private String pi_receivename;//应付供应商名称
-	private List<MakeProdInOutDetail> details;//明细
-	
+public class MakeProdInOut {
+
+	private Long pi_id;// ERP对应的id
+	private String pi_inoutno;// 委外验收单号
+	private Long pi_vendoruu;// 委外供应商uu号
+	private String pi_currency;// 币别
+	private Float pi_rate;// 汇率
+	private String pi_payment;// 付款方式
+	private String pi_transport;// 运输方式
+	private String pi_remark;// 备注
+	private String pi_inoutman;// 过账人
+	private Date pi_date;// 过账日期
+	private String pi_sendcode;// 送货单号
+	private String pi_receivecode;// 应付供应商编号
+	private String pi_receivename;// 应付供应商名称
+	private List<MakeProdInOutDetail> details;// 明细
+
+	public Long getPi_id() {
+		return pi_id;
+	}
+
+	public void setPi_id(Long pi_id) {
+		this.pi_id = pi_id;
+	}
+
 	public String getPi_inoutno() {
 		return pi_inoutno;
 	}
+
 	public void setPi_inoutno(String pi_inoutno) {
 		this.pi_inoutno = pi_inoutno;
 	}
+
 	public Long getPi_vendoruu() {
 		return pi_vendoruu;
 	}
+
 	public void setPi_vendoruu(Long pi_vendoruu) {
 		this.pi_vendoruu = pi_vendoruu;
 	}
+
 	public String getPi_currency() {
 		return pi_currency;
 	}
+
 	public void setPi_currency(String pi_currency) {
 		this.pi_currency = pi_currency;
 	}
+
 	public Float getPi_rate() {
 		return pi_rate;
 	}
+
 	public void setPi_rate(Float pi_rate) {
 		this.pi_rate = pi_rate;
 	}
+
 	public String getPi_payment() {
 		return pi_payment;
 	}
+
 	public void setPi_payment(String pi_payment) {
 		this.pi_payment = pi_payment;
 	}
+
 	public String getPi_transport() {
 		return pi_transport;
 	}
+
 	public void setPi_transport(String pi_transport) {
 		this.pi_transport = pi_transport;
 	}
+
 	public String getPi_remark() {
 		return pi_remark;
 	}
+
 	public void setPi_remark(String pi_remark) {
 		this.pi_remark = pi_remark;
 	}
+
 	public String getPi_inoutman() {
 		return pi_inoutman;
 	}
+
 	public void setPi_inoutman(String pi_inoutman) {
 		this.pi_inoutman = pi_inoutman;
 	}
+
 	public Date getPi_date() {
 		return pi_date;
 	}
+
 	public void setPi_date(Date pi_date) {
 		this.pi_date = pi_date;
 	}
+
 	public String getPi_sendcode() {
 		return pi_sendcode;
 	}
+
 	public void setPi_sendcode(String pi_sendcode) {
 		this.pi_sendcode = pi_sendcode;
-	}	
+	}
+
 	public String getPi_receivecode() {
 		return pi_receivecode;
 	}
+
 	public void setPi_receivecode(String pi_receivecode) {
 		this.pi_receivecode = pi_receivecode;
 	}
+
 	public String getPi_receivename() {
 		return pi_receivename;
 	}
+
 	public void setPi_receivename(String pi_receivename) {
 		this.pi_receivename = pi_receivename;
 	}
+
 	public List<MakeProdInOutDetail> getDetails() {
 		return details;
 	}
+
 	public void setDetails(List<MakeProdInOutDetail> details) {
 		this.details = details;
 	}
-	public MakeAccept convent(){
+
+	public MakeAccept convent() {
 		MakeAccept accept = new MakeAccept();
+		accept.setErpId(this.pi_id);
 		accept.setCode(this.pi_inoutno);
 		accept.setVendUU(this.pi_vendoruu);
 		accept.setCurrency(this.pi_currency);
@@ -129,17 +165,19 @@ public class MakeProdInOut{
 		accept.setReceiveName(this.pi_receivename);
 		accept.setReceiveCode(this.pi_receivecode);
 		accept.setSendStatus((short) Status.NOT_UPLOAD.value());
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<MakeAcceptItem> acceptItems = new HashSet<MakeAcceptItem>();
-			for(MakeProdInOutDetail detail : this.details) {
+			for (MakeProdInOutDetail detail : this.details) {
 				acceptItems.add(detail.convent());
 			}
 			accept.setAcceptItems(acceptItems);
 		}
 		return accept;
 	}
-	public MakeReturn conventToReturn(){
+
+	public MakeReturn conventToReturn() {
 		MakeReturn makeReturn = new MakeReturn();
+		makeReturn.setErpId(this.pi_id);
 		makeReturn.setCode(this.pi_inoutno);
 		makeReturn.setVendUU(this.pi_vendoruu);
 		makeReturn.setCurrency(this.pi_currency);
@@ -153,9 +191,9 @@ public class MakeProdInOut{
 		makeReturn.setReceiveName(this.pi_receivename);
 		makeReturn.setReceiveCode(this.pi_receivecode);
 		makeReturn.setSendStatus((short) Status.NOT_UPLOAD.value());
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<MakeReturnItem> returnItems = new HashSet<MakeReturnItem>();
-			for(MakeProdInOutDetail detail : this.details) {
+			for (MakeProdInOutDetail detail : this.details) {
 				returnItems.add(detail.conventToReturn());
 			}
 			makeReturn.setReturnItems(returnItems);

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

@@ -14,29 +14,28 @@ import com.uas.platform.b2b.model.PurchaseProofingItem;
 import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.support.SystemSession;
 
-
 /**
  * 买家ERP系统的采购询价单
  * 
  * @author yingp
  * 
  */
-public class ProductSample{
-	
+public class ProductSample {
+
 	private Long ps_id;
 	private String ps_code;
 	private String ps_recordor;
 	private Date ps_indate;
 	private Long ps_appmanuu;
 	private String ps_prodcode;
-	private String ps_isfree;//是否收费
+	private String ps_isfree;// 是否收费
 	private Date ps_delivery;
 	private String ps_envrequire;
 	private String ps_scope;
 	private String ps_remark;
-	private String ps_attach;//附件
+	private String ps_attach;// 附件
 	private List<ProductSampleDetail> details;
-	
+
 	public Long getPs_id() {
 		return ps_id;
 	}
@@ -146,6 +145,7 @@ public class ProductSample{
 	 */
 	public PurchaseProofing convert() {
 		PurchaseProofing proofing = new PurchaseProofing();
+		proofing.setErpId(ps_id);
 		proofing.setCode(ps_code);
 		proofing.setDate(ps_indate);
 		proofing.setDelivery(ps_delivery);
@@ -165,14 +165,12 @@ public class ProductSample{
 		proofing.setUserUU(ps_appmanuu);
 		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseProofingItem> proofingItems = new HashSet<PurchaseProofingItem>();
-			for(ProductSampleDetail detail : details) {
+			for (ProductSampleDetail detail : details) {
 				proofingItems.add(detail.convert());
 			}
 			proofing.setProofingItems(proofingItems);
 		}
 		return proofing;
 	}
-	
-
 
 }

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

@@ -15,6 +15,7 @@ import com.uas.platform.core.model.Status;
 
 /**
  * 采购方角度ERP应付票据单
+ * 
  * @author suntg
  * @date 2015年4月17日10:32:24
  *
@@ -42,136 +43,178 @@ public class PurchaseAPBill {
 	private Double ab_differ;
 	private String ab_remark;
 	private List<PurchaseAPBillDetail> details;
-	
+
 	public Long getAb_id() {
 		return ab_id;
 	}
+
 	public void setAb_id(Long ab_id) {
 		this.ab_id = ab_id;
 	}
+
 	public String getAb_code() {
 		return ab_code;
 	}
+
 	public void setAb_code(String ab_code) {
 		this.ab_code = ab_code;
 	}
+
 	public Date getAb_date() {
 		return ab_date;
 	}
+
 	public void setAb_date(Date ab_date) {
 		this.ab_date = ab_date;
 	}
+
 	public Long getAb_yearmonth() {
 		return ab_yearmonth;
 	}
+
 	public void setAb_yearmonth(Long ab_yearmonth) {
 		this.ab_yearmonth = ab_yearmonth;
 	}
+
 	public String getAb_currency() {
 		return ab_currency;
 	}
+
 	public void setAb_currency(String ab_currency) {
 		this.ab_currency = ab_currency;
 	}
+
 	public Double getAb_rate() {
 		return ab_rate;
 	}
+
 	public void setAb_rate(Double ab_rate) {
 		this.ab_rate = ab_rate;
 	}
+
 	public String getAb_buyer() {
 		return ab_buyer;
 	}
+
 	public void setAb_buyer(String ab_buyer) {
 		this.ab_buyer = ab_buyer;
 	}
+
 	public Long getAb_vendoruu() {
 		return ab_vendoruu;
 	}
+
 	public void setAb_vendoruu(Long ab_vendoruu) {
 		this.ab_vendoruu = ab_vendoruu;
 	}
+
 	public String getAb_status() {
 		return ab_status;
 	}
+
 	public void setAb_status(String ab_status) {
 		this.ab_status = ab_status;
 	}
+
 	public String getAb_payments() {
 		return ab_payments;
 	}
+
 	public void setAb_payments(String ab_payments) {
 		this.ab_payments = ab_payments;
 	}
+
 	public Date getAb_paydate() {
 		return ab_paydate;
 	}
+
 	public void setAb_paydate(Date ab_paydate) {
 		this.ab_paydate = ab_paydate;
 	}
+
 	public String getAb_refno() {
 		return ab_refno;
 	}
+
 	public void setAb_refno(String ab_refno) {
 		this.ab_refno = ab_refno;
 	}
+
 	public String getAb_recorder() {
 		return ab_recorder;
 	}
+
 	public void setAb_recorder(String ab_recorder) {
 		this.ab_recorder = ab_recorder;
 	}
+
 	public Date getAb_indate() {
 		return ab_indate;
 	}
+
 	public void setAb_indate(Date ab_indate) {
 		this.ab_indate = ab_indate;
 	}
+
 	public Double getAb_apamount() {
 		return ab_apamount;
 	}
+
 	public void setAb_apamount(Double ab_apamount) {
 		this.ab_apamount = ab_apamount;
 	}
+
 	public Double getAb_payamount() {
 		return ab_payamount;
 	}
+
 	public void setAb_payamount(Double ab_payamount) {
 		this.ab_payamount = ab_payamount;
 	}
+
 	public String getAb_pricetermdes() {
 		return ab_pricetermdes;
 	}
+
 	public void setAb_pricetermdes(String ab_pricetermdes) {
 		this.ab_pricetermdes = ab_pricetermdes;
 	}
+
 	public Double getAb_taxsum() {
 		return ab_taxsum;
 	}
+
 	public void setAb_taxsum(Double ab_taxsum) {
 		this.ab_taxsum = ab_taxsum;
 	}
+
 	public Double getAb_differ() {
 		return ab_differ;
 	}
+
 	public void setAb_differ(Double ab_differ) {
 		this.ab_differ = ab_differ;
 	}
+
 	public String getAb_remark() {
 		return ab_remark;
 	}
+
 	public void setAb_remark(String ab_remark) {
 		this.ab_remark = ab_remark;
 	}
+
 	public List<PurchaseAPBillDetail> getDetails() {
 		return details;
 	}
+
 	public void setDetails(List<PurchaseAPBillDetail> details) {
 		this.details = details;
 	}
-	
+
 	public PurchaseApBill convert() {
 		PurchaseApBill apBill = new PurchaseApBill();
+		apBill.setErpId(ab_id);
 		apBill.setApAmount(ab_apamount);
 		apBill.setCode(ab_code);
 		apBill.setCurrency(ab_currency);
@@ -194,15 +237,14 @@ public class PurchaseAPBill {
 		apBill.setTaxSum(ab_taxsum);
 		apBill.setUserName(ab_buyer);
 		apBill.setYearMouth(ab_yearmonth);
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseApBillItem> apBillItems = new HashSet<PurchaseApBillItem>();
-			for(PurchaseAPBillDetail detail : this.details) {
+			for (PurchaseAPBillDetail detail : this.details) {
 				apBillItems.add(detail.convert());
 			}
 			apBill.setItems(apBillItems);
 		}
 		return apBill;
 	}
-	
-	
+
 }

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

@@ -22,6 +22,7 @@ import com.uas.platform.core.model.Status;
  */
 public class PurchaseChange {
 
+	private Long pc_id;
 	private String pc_code;
 	private String pc_purccode;
 	private Date pc_indate;
@@ -35,6 +36,14 @@ public class PurchaseChange {
 	private Short pc_needvendcheck;
 	private List<PurchaseChangeDetail> changeDetails;
 
+	public Long getPc_id() {
+		return pc_id;
+	}
+
+	public void setPc_id(Long pc_id) {
+		this.pc_id = pc_id;
+	}
+
 	public String getPc_code() {
 		return pc_code;
 	}
@@ -139,6 +148,7 @@ public class PurchaseChange {
 	public PurchaseOrderChange convert() {
 		PurchaseOrderChange change = new PurchaseOrderChange();
 		change.setBackStatus((short) Status.NOT_UPLOAD.value());
+		change.setErpId(this.pc_id);
 		change.setCode(this.pc_code);
 		change.setDate(this.pc_indate);
 		change.setDescription(this.pc_description);
@@ -153,7 +163,7 @@ public class PurchaseChange {
 		change.setStatus((short) Status.NOT_REPLY.value());
 		change.setAgreed(getPc_agreed());
 		int check = this.pc_needvendcheck != null ? (this.pc_needvendcheck + 1) : null;
-		change.setUnNeedReply((short)check);
+		change.setUnNeedReply((short) check);
 		if (change.isAgreed()) {
 			// 买家已同意的，无需再传回到买家ERP
 			change.setStatus((short) Status.REPLIED.value());

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

@@ -110,6 +110,7 @@ public class PurchaseForecast {
 			}
 			forecast.setForecastItems(items);
 		}
+		forecast.setErpId(this.pf_id);
 		return forecast;
 	}
 }

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

@@ -20,106 +20,141 @@ import com.uas.platform.core.model.Status;
 
 /**
  * 采购方角度ERP采购验收单
+ * 
  * @author suntg
  * @date 2015年4月17日10:32:24
  *
  */
 public class PurchaseProdInOut {
 
-	private String pi_inoutno;//采购检验单号
-	private Long pi_vendoruu;//客户uu号
-	private String pi_currency;//币别
-	private Float pi_rate;//汇率
-	private String pi_payment;//付款方式
-	private String pi_transport;//运输方式
-	private String pi_remark;//备注
-	private String pi_inoutman;//过账人
-	private Date pi_date;//过账日期
-	private String pi_sendcode;//送货单号
-	private String pi_receivename;//应付供应商名
-	private String pi_receivecode;//应付供应商编号
-	private List<PurchaseProdInOutDetail> details;//明细
-	
+	private Long pi_id;// id
+	private String pi_inoutno;// 采购检验单号
+	private Long pi_vendoruu;// 客户uu号
+	private String pi_currency;// 币别
+	private Float pi_rate;// 汇率
+	private String pi_payment;// 付款方式
+	private String pi_transport;// 运输方式
+	private String pi_remark;// 备注
+	private String pi_inoutman;// 过账人
+	private Date pi_date;// 过账日期
+	private String pi_sendcode;// 送货单号
+	private String pi_receivename;// 应付供应商名
+	private String pi_receivecode;// 应付供应商编号
+	private List<PurchaseProdInOutDetail> details;// 明细
+
+	public Long getPi_id() {
+		return pi_id;
+	}
+
+	public void setPi_id(Long pi_id) {
+		this.pi_id = pi_id;
+	}
+
 	public String getPi_inoutno() {
 		return pi_inoutno;
 	}
+
 	public void setPi_inoutno(String pi_inoutno) {
 		this.pi_inoutno = pi_inoutno;
 	}
+
 	public Long getPi_vendoruu() {
 		return pi_vendoruu;
 	}
+
 	public void setPi_vendoruu(Long pi_vendoruu) {
 		this.pi_vendoruu = pi_vendoruu;
 	}
+
 	public String getPi_currency() {
 		return pi_currency;
 	}
+
 	public void setPi_currency(String pi_currency) {
 		this.pi_currency = pi_currency;
 	}
+
 	public Float getPi_rate() {
 		return pi_rate;
 	}
+
 	public void setPi_rate(Float pi_rate) {
 		this.pi_rate = pi_rate;
 	}
+
 	public String getPi_payment() {
 		return pi_payment;
 	}
+
 	public void setPi_payment(String pi_payment) {
 		this.pi_payment = pi_payment;
 	}
+
 	public String getPi_transport() {
 		return pi_transport;
 	}
+
 	public void setPi_transport(String pi_transport) {
 		this.pi_transport = pi_transport;
 	}
+
 	public String getPi_remark() {
 		return pi_remark;
 	}
+
 	public void setPi_remark(String pi_remark) {
 		this.pi_remark = pi_remark;
 	}
+
 	public String getPi_inoutman() {
 		return pi_inoutman;
 	}
+
 	public void setPi_inoutman(String pi_inoutman) {
 		this.pi_inoutman = pi_inoutman;
 	}
+
 	public Date getPi_date() {
 		return pi_date;
 	}
+
 	public void setPi_date(Date pi_date) {
 		this.pi_date = pi_date;
 	}
+
 	public String getPi_sendcode() {
 		return pi_sendcode;
 	}
+
 	public void setPi_sendcode(String pi_sendcode) {
 		this.pi_sendcode = pi_sendcode;
 	}
+
 	public String getPi_receivename() {
 		return pi_receivename;
 	}
+
 	public void setPi_receivename(String pi_receivename) {
 		this.pi_receivename = pi_receivename;
 	}
+
 	public String getPi_receivecode() {
 		return pi_receivecode;
 	}
+
 	public void setPi_receivecode(String pi_receivecode) {
 		this.pi_receivecode = pi_receivecode;
 	}
+
 	public List<PurchaseProdInOutDetail> getDetails() {
 		return details;
 	}
+
 	public void setDetails(List<PurchaseProdInOutDetail> details) {
 		this.details = details;
 	}
-	
-	public PurchaseAccept convent(){
+
+	public PurchaseAccept convent() {
 		PurchaseAccept accept = new PurchaseAccept();
 		accept.setCode(this.pi_inoutno);
 		accept.setCurrency(this.pi_currency);
@@ -134,17 +169,18 @@ public class PurchaseProdInOut {
 		accept.setSendStatus((short) Status.NOT_UPLOAD.value());
 		accept.setReceivename(this.pi_receivename);
 		accept.setReceivecode(this.pi_receivecode);
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseAcceptItem> acceptItems = new HashSet<PurchaseAcceptItem>();
-			for(PurchaseProdInOutDetail detail : this.details) {
+			for (PurchaseProdInOutDetail detail : this.details) {
 				acceptItems.add(detail.convent());
 			}
 			accept.setAcceptItems(acceptItems);
 		}
+		accept.setErpId(this.pi_id);
 		return accept;
 	}
-	
-	public PurchaseReturn conventToReturn(){
+
+	public PurchaseReturn conventToReturn() {
 		PurchaseReturn purchaseReturn = new PurchaseReturn();
 		purchaseReturn.setCode(this.pi_inoutno);
 		purchaseReturn.setCurrency(this.pi_currency);
@@ -159,17 +195,18 @@ public class PurchaseProdInOut {
 		purchaseReturn.setReceivename(this.pi_receivename);
 		purchaseReturn.setReceivecode(this.pi_receivecode);
 		purchaseReturn.setSendStatus((short) Status.NOT_UPLOAD.value());
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseReturnItem> returnItems = new HashSet<PurchaseReturnItem>();
-			for(PurchaseProdInOutDetail detail : this.details) {
+			for (PurchaseProdInOutDetail detail : this.details) {
 				returnItems.add(detail.conventToReturn());
 			}
 			purchaseReturn.setReturnItems(returnItems);
 		}
+		purchaseReturn.setErpId(this.pi_id);
 		return purchaseReturn;
 	}
-	
-	public PurchaseBadIn conventToBadIn(){
+
+	public PurchaseBadIn conventToBadIn() {
 		PurchaseBadIn purchaseBadIn = new PurchaseBadIn();
 		purchaseBadIn.setCode(this.pi_inoutno);
 		purchaseBadIn.setCurrency(this.pi_currency);
@@ -184,17 +221,18 @@ public class PurchaseProdInOut {
 		purchaseBadIn.setReceiveCode(this.pi_receivecode);
 		purchaseBadIn.setReceiveName(this.pi_receivename);
 		purchaseBadIn.setSendStatus((short) Status.NOT_UPLOAD.value());
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseBadInItem> badInItems = new HashSet<PurchaseBadInItem>();
-			for(PurchaseProdInOutDetail detail : this.details) {
+			for (PurchaseProdInOutDetail detail : this.details) {
 				badInItems.add(detail.conventToBadIn());
 			}
 			purchaseBadIn.setBadInItems(badInItems);
 		}
+		purchaseBadIn.setErpId(this.pi_id);
 		return purchaseBadIn;
 	}
-	
-	public PurchaseBadOut conventToBadOut(){
+
+	public PurchaseBadOut conventToBadOut() {
 		PurchaseBadOut purchaseBadOut = new PurchaseBadOut();
 		purchaseBadOut.setCode(this.pi_inoutno);
 		purchaseBadOut.setCurrency(this.pi_currency);
@@ -209,13 +247,14 @@ public class PurchaseProdInOut {
 		purchaseBadOut.setReceiveCode(this.pi_receivecode);
 		purchaseBadOut.setReceiveName(this.pi_receivename);
 		purchaseBadOut.setSendStatus((short) Status.NOT_UPLOAD.value());
-		if(! CollectionUtils.isEmpty(this.details)) {
+		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseBadOutItem> badOutItems = new HashSet<PurchaseBadOutItem>();
-			for(PurchaseProdInOutDetail detail : this.details) {
+			for (PurchaseProdInOutDetail detail : this.details) {
 				badOutItems.add(detail.conventToBadOut());
 			}
 			purchaseBadOut.setBadOutItems(badOutItems);
 		}
+		purchaseBadOut.setErpId(this.pi_id);
 		return purchaseBadOut;
 	}
 }

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

@@ -7,143 +7,177 @@ import java.util.Set;
 
 import org.springframework.util.CollectionUtils;
 
+import com.uas.platform.b2b.model.PurchaseBadIn;
+import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseMRBCheckItem;
 import com.uas.platform.b2b.model.PurchaseMRBProjectItem;
 import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 
 /**
  * 买方MRB
+ * 
  * @author suntg
  *
  */
 public class PurchaseQuaMRB {
-	
-	private Long mr_id;//id
-	private String mr_code;//编号
-	private Date mr_date;//日期
-	private Long mr_venduu;//供应商uu 
-	private String mr_pucode;//采购单编号
-	private Short mr_pudetno;//采购单明细行号
-	private String mr_vecode;//来源不良品入库单号
-	private Date mr_datein;//送检日期
-	private Double mr_inqty;//来料数量
-	private Double mr_checkqty;//检验数量
-	private Double mr_ngqty;//不合格数
-	private Double mr_okqty;//合格数
-	private String mr_result;//检验结果
-	private String mr_remark;//备注
-	private String mr_shcode;//收货单号
-	private List<PurchaseQuaMRBCheckItem> checkItems;//检验明细行
-	private List<PurchaseQuaMRBProjectItem> projectItems;//项目明细行
-	
+
+	private Long mr_id;// id
+	private String mr_code;// 编号
+	private Date mr_date;// 日期
+	private Long mr_venduu;// 供应商uu
+	private String mr_pucode;// 采购单编号
+	private Short mr_pudetno;// 采购单明细行号
+	private String mr_vecode;// 来源不良品入库单号
+	private Date mr_datein;// 送检日期
+	private Double mr_inqty;// 来料数量
+	private Double mr_checkqty;// 检验数量
+	private Double mr_ngqty;// 不合格数
+	private Double mr_okqty;// 合格数
+	private String mr_result;// 检验结果
+	private String mr_remark;// 备注
+	private String mr_shcode;// 收货单号
+	private List<PurchaseQuaMRBCheckItem> checkItems;// 检验明细行
+	private List<PurchaseQuaMRBProjectItem> projectItems;// 项目明细行
+
 	public String getMr_code() {
 		return mr_code;
 	}
+
 	public void setMr_code(String mr_code) {
 		this.mr_code = mr_code;
 	}
+
 	public Date getMr_date() {
 		return mr_date;
 	}
+
 	public void setMr_date(Date mr_date) {
 		this.mr_date = mr_date;
 	}
+
 	public Long getMr_venduu() {
 		return mr_venduu;
 	}
+
 	public void setMr_venduu(Long mr_venduu) {
 		this.mr_venduu = mr_venduu;
 	}
+
 	public String getMr_pucode() {
 		return mr_pucode;
 	}
+
 	public void setMr_pucode(String mr_pucode) {
 		this.mr_pucode = mr_pucode;
 	}
+
 	public Short getMr_pudetno() {
 		return mr_pudetno;
 	}
+
 	public void setMr_pudetno(Short mr_pudetno) {
 		this.mr_pudetno = mr_pudetno;
 	}
+
 	public Date getMr_datein() {
 		return mr_datein;
 	}
+
 	public void setMr_datein(Date mr_datein) {
 		this.mr_datein = mr_datein;
 	}
+
 	public Double getMr_inqty() {
 		return mr_inqty;
 	}
+
 	public void setMr_inqty(Double mr_inqty) {
 		this.mr_inqty = mr_inqty;
 	}
+
 	public Double getMr_checkqty() {
 		return mr_checkqty;
 	}
+
 	public void setMr_checkqty(Double mr_checkqty) {
 		this.mr_checkqty = mr_checkqty;
 	}
+
 	public Double getMr_ngqty() {
 		return mr_ngqty;
 	}
+
 	public void setMr_ngqty(Double mr_ngqty) {
 		this.mr_ngqty = mr_ngqty;
 	}
+
 	public Double getMr_okqty() {
 		return mr_okqty;
 	}
+
 	public void setMr_okqty(Double mr_okqty) {
 		this.mr_okqty = mr_okqty;
 	}
+
 	public String getMr_result() {
 		return mr_result;
 	}
+
 	public void setMr_result(String mr_result) {
 		this.mr_result = mr_result;
 	}
+
 	public String getMr_remark() {
 		return mr_remark;
 	}
+
 	public void setMr_remark(String mr_remark) {
 		this.mr_remark = mr_remark;
 	}
+
 	public String getMr_shcode() {
 		return mr_shcode;
 	}
+
 	public void setMr_shcode(String mr_shcode) {
 		this.mr_shcode = mr_shcode;
 	}
+
 	public List<PurchaseQuaMRBCheckItem> getCheckItems() {
 		return checkItems;
 	}
+
 	public void setCheckItems(List<PurchaseQuaMRBCheckItem> checkItems) {
 		this.checkItems = checkItems;
 	}
+
 	public List<PurchaseQuaMRBProjectItem> getProjectItems() {
 		return projectItems;
 	}
+
 	public void setProjectItems(List<PurchaseQuaMRBProjectItem> projectItems) {
 		this.projectItems = projectItems;
 	}
+
 	public Long getMr_id() {
 		return mr_id;
 	}
+
 	public void setMr_id(Long mr_id) {
 		this.mr_id = mr_id;
 	}
+
 	public String getMr_vecode() {
 		return mr_vecode;
 	}
+
 	public void setMr_vecode(String mr_vecode) {
 		this.mr_vecode = mr_vecode;
 	}
-	
+
 	public PurchaseMRB convent() {
 		PurchaseMRB purchaseMRB = new PurchaseMRB();
 		purchaseMRB.setCheckQty(mr_checkqty);
@@ -168,24 +202,23 @@ public class PurchaseQuaMRB {
 		orderItem.setNumber(mr_pudetno);
 		purchaseMRB.setOrderItem(orderItem);
 		purchaseMRB.setSendStatus((short) Status.NOT_UPLOAD.value());
-		if(! CollectionUtils.isEmpty(this.checkItems)) {
+		if (!CollectionUtils.isEmpty(this.checkItems)) {
 			Set<PurchaseMRBCheckItem> checkItems = new HashSet<PurchaseMRBCheckItem>();
-			for(PurchaseQuaMRBCheckItem quaMRBCheckItem : this.checkItems) {
+			for (PurchaseQuaMRBCheckItem quaMRBCheckItem : this.checkItems) {
 				checkItems.add(quaMRBCheckItem.convent());
 			}
 			purchaseMRB.setCheckItems(checkItems);
 		}
-		if(! CollectionUtils.isEmpty(this.projectItems)) {
+		if (!CollectionUtils.isEmpty(this.projectItems)) {
 			Set<PurchaseMRBProjectItem> projectItems = new HashSet<PurchaseMRBProjectItem>();
-			for(PurchaseQuaMRBProjectItem quaMRBProjectItem : this.projectItems) {
+			for (PurchaseQuaMRBProjectItem quaMRBProjectItem : this.projectItems) {
 				projectItems.add(quaMRBProjectItem.convent());
 			}
 			purchaseMRB.setProjectItems(projectItems);
 		}
+		purchaseMRB.setErpId(this.mr_id);
 		return purchaseMRB;
-		
+
 	}
-	
-	
 
 }

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

@@ -21,6 +21,7 @@ import com.uas.platform.core.model.Status;
  */
 public class Quotation {
 
+	private long qu_id;
 	private long cu_uu;
 	private Long qu_custcontactuu;
 	private String qu_custcontact;
@@ -36,6 +37,14 @@ public class Quotation {
 	private String qu_environment;
 	private List<QuotationDetail> details;
 
+	public long getQu_id() {
+		return qu_id;
+	}
+
+	public void setQu_id(long qu_id) {
+		this.qu_id = qu_id;
+	}
+
 	public long getCu_uu() {
 		return cu_uu;
 	}
@@ -43,7 +52,7 @@ public class Quotation {
 	public void setCu_uu(long cu_uu) {
 		this.cu_uu = cu_uu;
 	}
-	
+
 	public String getQu_environment() {
 		return qu_environment;
 	}
@@ -176,13 +185,14 @@ public class Quotation {
 				quotationItems.add(detail.convert());
 		}
 		quotation.setQuotationItems(quotationItems);
+		quotation.setErpId(this.qu_id);
 		return quotation;
 	}
 
 	public Quotation() {
-		
+
 	}
-	
+
 	public Quotation(SaleQuotation quotation) {
 		this.cu_uu = quotation.getCustUU();
 		this.qu_code = quotation.getCode();
@@ -196,9 +206,10 @@ public class Quotation {
 		this.qu_remark = quotation.getRemark();
 		this.qu_useruu = quotation.getUserUU();
 		this.b2b_qu_id = quotation.getId();
+		this.qu_id = quotation.getErpId();
 		List<QuotationDetail> details = new ArrayList<QuotationDetail>();
-		if(!CollectionUtils.isEmpty(quotation.getQuotationItems())){
-			for(SaleQuotationItem item : quotation.getQuotationItems()) {
+		if (!CollectionUtils.isEmpty(quotation.getQuotationItems())) {
+			for (SaleQuotationItem item : quotation.getQuotationItems()) {
 				details.add(new QuotationDetail(item));
 			}
 		}

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

@@ -14,6 +14,7 @@ import com.uas.platform.core.model.Status;
  */
 public class SaleReply {
 
+	private int sr_id;
 	private Double sr_qty;
 	private Date sr_delivery;
 	private String sr_remark;
@@ -26,6 +27,14 @@ public class SaleReply {
 	private Long b2b_pr_id;
 	private String sr_type;
 
+	public int getSr_id() {
+		return sr_id;
+	}
+
+	public void setSr_id(int sr_id) {
+		this.sr_id = sr_id;
+	}
+
 	public Double getSr_qty() {
 		return sr_qty;
 	}
@@ -119,6 +128,8 @@ public class SaleReply {
 	 */
 	public PurchaseOrderReply convert() {
 		PurchaseOrderReply reply = new PurchaseOrderReply();
+		reply.setErpId(this.sr_id);
+		reply.setErpDate(new Date());
 		reply.setDate(this.sr_date);
 		reply.setDelivery(this.sr_delivery);
 		reply.setQty(this.sr_qty);