【帕诺迪】-订单传输修改

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

@@ -30,6 +30,18 @@ public class PurchaseDetail {
 	private String pd_factory;
 	private String pd_vendspec;
 	private Integer pd_beipin;
+	//终端供应商名称
+	private String pd_purcvendname;
+	//终端供应商uu
+	private Long pd_purcvenduu;
+	//客户采购订单号
+	private String pd_custpurchasecode;
+	//客户采购订单序号
+	private Short pd_custpurchasedetno;
+	//收货客户
+	private String pd_acceptcustname;
+	//收货地址
+	private String pd_acceptcustaddress;
 	private List<Attach> attaches;
 
 	public String getPd_vendspec() {
@@ -128,7 +140,55 @@ public class PurchaseDetail {
         this.attaches = attaches;
     }
 
-    /**
+	public String getPd_purcvendname() {
+		return pd_purcvendname;
+	}
+
+	public void setPd_purcvendname(String pd_purcvendname) {
+		this.pd_purcvendname = pd_purcvendname;
+	}
+
+	public Long getPd_purcvenduu() {
+		return pd_purcvenduu;
+	}
+
+	public void setPd_purcvenduu(Long pd_purcvenduu) {
+		this.pd_purcvenduu = pd_purcvenduu;
+	}
+
+	public String getPd_custpurchasecode() {
+		return pd_custpurchasecode;
+	}
+
+	public void setPd_custpurchasecode(String pd_custpurchasecode) {
+		this.pd_custpurchasecode = pd_custpurchasecode;
+	}
+
+	public Short getPd_custpurchasedetno() {
+		return pd_custpurchasedetno;
+	}
+
+	public void setPd_custpurchasedetno(Short pd_custpurchasedetno) {
+		this.pd_custpurchasedetno = pd_custpurchasedetno;
+	}
+
+	public String getPd_acceptcustname() {
+		return pd_acceptcustname;
+	}
+
+	public void setPd_acceptcustname(String pd_acceptcustname) {
+		this.pd_acceptcustname = pd_acceptcustname;
+	}
+
+	public String getPd_acceptcustaddress() {
+		return pd_acceptcustaddress;
+	}
+
+	public void setPd_acceptcustaddress(String pd_acceptcustaddress) {
+		this.pd_acceptcustaddress = pd_acceptcustaddress;
+	}
+
+	/**
 	 * 转为平台的采购订单明细
 	 * 
 	 * @return
@@ -146,6 +206,12 @@ public class PurchaseDetail {
 		item.setStatus((short) Status.NOT_REPLY.value());
 		item.setProductCode(this.pd_prodcode);
 		item.setBeipin(this.pd_beipin);
+		item.setPurcvendname(this.pd_purcvendname);
+		item.setPurcvenduu(this.pd_purcvenduu);
+		item.setCustpurchasecode(this.pd_custpurchasecode);
+		item.setCustpurchasedetno(this.pd_custpurchasedetno);
+		item.setAcceptcustname(this.pd_acceptcustname);
+		item.setAcceptcustaddress(this.pd_acceptcustaddress);
 		if (!CollectionUtils.isEmpty(this.attaches)) {
 			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();
 			for(Attach attach : this.attaches) {

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

@@ -26,6 +26,16 @@ public class SaleDownDetail {
 	private String sd_factory;
 	private String sd_prodsource;
 	private String sd_remark;
+	//终端供应商名称
+	private String sd_purcvendname;
+	//终端供应商uu
+	private Long sd_purcvenduu;
+	//客户采购订单序号
+	private Short sd_purcdetno;
+	//收货客户
+	private String sd_acceptcustname;
+	//收货地址
+	private String sd_acceptcustaddress;
 
 	public String getSd_remark() {
 		return sd_remark;
@@ -179,6 +189,46 @@ public class SaleDownDetail {
 		this.sd_prodsource = sd_prodsource;
 	}
 
+	public String getSd_purcvendname() {
+		return sd_purcvendname;
+	}
+
+	public void setSd_purcvendname(String sd_purcvendname) {
+		this.sd_purcvendname = sd_purcvendname;
+	}
+
+	public Long getSd_purcvenduu() {
+		return sd_purcvenduu;
+	}
+
+	public void setSd_purcvenduu(Long sd_purcvenduu) {
+		this.sd_purcvenduu = sd_purcvenduu;
+	}
+
+	public Short getSd_purcdetno() {
+		return sd_purcdetno;
+	}
+
+	public void setSd_purcdetno(Short sd_purcdetno) {
+		this.sd_purcdetno = sd_purcdetno;
+	}
+
+	public String getSd_acceptcustname() {
+		return sd_acceptcustname;
+	}
+
+	public void setSd_acceptcustname(String sd_acceptcustname) {
+		this.sd_acceptcustname = sd_acceptcustname;
+	}
+
+	public String getSd_acceptcustaddress() {
+		return sd_acceptcustaddress;
+	}
+
+	public void setSd_acceptcustaddress(String sd_acceptcustaddress) {
+		this.sd_acceptcustaddress = sd_acceptcustaddress;
+	}
+
 	public SaleDownDetail() {
 
 	}
@@ -208,6 +258,11 @@ public class SaleDownDetail {
 		this.sd_factory = orderItem.getFactory();
 		this.sd_prodsource = orderItem.getProdsource();
 		this.sd_remark = orderItem.getRemark();
+		this.sd_purcvendname = orderItem.getPurcvendname();
+		this.sd_purcvenduu = orderItem.getPurcvenduu();
+		this.sd_purcdetno = orderItem.getCustpurchasedetno();
+		this.sd_acceptcustname = orderItem.getAcceptcustname();
+		this.sd_acceptcustaddress = orderItem.getAcceptcustaddress();
 	}
 
 	/**

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

@@ -155,6 +155,42 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
 
+	/**
+	 * 终端供应商名称
+	 */
+	@Column(name = "pd_purcvendname")
+	private String purcvendname;
+
+	/**
+	 * 终端供应商uu
+	 */
+	@Column(name = "pd_purcvenduu")
+	private Long purcvenduu;
+
+	/**
+	 * 客户采购订单号
+	 */
+	@Column(name = "pd_custpurchasecode")
+	private String custpurchasecode;
+
+	/**
+	 * 客户采购订单序号
+	 */
+	@Column(name = "pd_custpurchasedetno")
+	private Short custpurchasedetno;
+
+	/**
+	 * 收货客户
+	 */
+	@Column(name = "pd_acceptcustname")
+	private String acceptcustname;
+
+	/**
+	 * 收货地址
+	 */
+	@Column(name = "pd_acceptcustaddress")
+	private  String acceptcustaddress;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -368,6 +404,54 @@ public class PurcOrderInfoItem extends AbstractOrderProduct {
 		this.vendspec = vendspec;
 	}
 
+	public String getPurcvendname() {
+		return purcvendname;
+	}
+
+	public void setPurcvendname(String purcvendname) {
+		this.purcvendname = purcvendname;
+	}
+
+	public Long getPurcvenduu() {
+		return purcvenduu;
+	}
+
+	public void setPurcvenduu(Long purcvenduu) {
+		this.purcvenduu = purcvenduu;
+	}
+
+	public String getCustpurchasecode() {
+		return custpurchasecode;
+	}
+
+	public void setCustpurchasecode(String custpurchasecode) {
+		this.custpurchasecode = custpurchasecode;
+	}
+
+	public Short getCustpurchasedetno() {
+		return custpurchasedetno;
+	}
+
+	public void setCustpurchasedetno(Short custpurchasedetno) {
+		this.custpurchasedetno = custpurchasedetno;
+	}
+
+	public String getAcceptcustname() {
+		return acceptcustname;
+	}
+
+	public void setAcceptcustname(String acceptcustname) {
+		this.acceptcustname = acceptcustname;
+	}
+
+	public String getAcceptcustaddress() {
+		return acceptcustaddress;
+	}
+
+	public void setAcceptcustaddress(String acceptcustaddress) {
+		this.acceptcustaddress = acceptcustaddress;
+	}
+
 	public double getBalance() {
 		double qtyNum, returnQtyNum, acceptQtyNum;
 		qtyNum = qty == null ? 0 : qty;

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

@@ -174,6 +174,42 @@ public class PurchaseOrderAllItem extends AbstractOrderProduct {
     @Column(name = "pd_audid")
     private Long audId;
 
+	/**
+	 * 终端供应商名称
+	 */
+	@Column(name = "pd_purcvendname")
+	private String purcvendname;
+
+	/**
+	 * 终端供应商uu
+	 */
+	@Column(name = "pd_purcvenduu")
+    private Long purcvenduu;
+
+	/**
+	 * 客户采购订单号
+	 */
+	@Column(name = "pd_custpurchasecode")
+    private String custpurchasecode;
+
+	/**
+	 * 客户采购订单序号
+	 */
+	@Column(name = "pd_custpurchasedetno")
+    private Short custpurchasedetno;
+
+	/**
+	 * 收货客户
+	 */
+	@Column(name = "pd_acceptcustname")
+	private String acceptcustname;
+
+	/**
+	 * 收货地址
+	 */
+	@Column(name = "pd_acceptcustaddress")
+    private  String acceptcustaddress;
+
 	/**
 	 * 是否在变更中
 	 */
@@ -443,4 +479,51 @@ public class PurchaseOrderAllItem extends AbstractOrderProduct {
 		return orders;
 	}
 
+	public String getPurcvendname() {
+		return purcvendname;
+	}
+
+	public void setPurcvendname(String purcvendname) {
+		this.purcvendname = purcvendname;
+	}
+
+	public Long getPurcvenduu() {
+		return purcvenduu;
+	}
+
+	public void setPurcvenduu(Long purcvenduu) {
+		this.purcvenduu = purcvenduu;
+	}
+
+	public String getCustpurchasecode() {
+		return custpurchasecode;
+	}
+
+	public void setCustpurchasecode(String custpurchasecode) {
+		this.custpurchasecode = custpurchasecode;
+	}
+
+	public Short getCustpurchasedetno() {
+		return custpurchasedetno;
+	}
+
+	public void setCustpurchasedetno(Short custpurchasedetno) {
+		this.custpurchasedetno = custpurchasedetno;
+	}
+
+	public String getAcceptcustname() {
+		return acceptcustname;
+	}
+
+	public void setAcceptcustname(String acceptcustname) {
+		this.acceptcustname = acceptcustname;
+	}
+
+	public String getAcceptcustaddress() {
+		return acceptcustaddress;
+	}
+
+	public void setAcceptcustaddress(String acceptcustaddress) {
+		this.acceptcustaddress = acceptcustaddress;
+	}
 }

src/test/java/com/uas/platform/b2b/purc/PurchaseNoticeSearchTest.java

@@ -30,9 +30,9 @@ public class PurchaseNoticeSearchTest {
      * @throws Exception
      */
     @Test
-    public void checkAndUpdate() throws Exception {
+    public void checkAndUpdateAA() throws Exception {
         List<Long> ids = new ArrayList<>();
-        for (Long i=1228329L;i<=1228388L;i++) {
+        for (Long i=1228788L;i<=1229289L;i++) {
             ids.add(i);
         }
         List<Long> list = checkAll("purc$notice",ids);
@@ -115,7 +115,7 @@ public class PurchaseNoticeSearchTest {
 
     @Test
     public void test() throws Exception{
-        update("purc$orders",13824692L);
+        update("purc$orders",13832582L);
     }
 
     public void checkIndex() throws Exception{