ソースを参照

消息实体修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9869 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 8 年 前
コミット
64bbf96ffe

+ 63 - 5
src/main/java/com/uas/platform/b2b/model/PagingRelease.java

@@ -95,6 +95,30 @@ public class PagingRelease implements Serializable {
     @Column(name = "pr_type")
     private String type;
 
+    /**
+     * 来源表
+     */
+    @Column(name = "pr_table")
+    private String table;
+
+    /**
+     * 消息分类 (对接收方来说,单据类型,sale为销售,purc为采购)
+     */
+    @Column(name = "pr_category")
+    private String category;
+
+    /**
+     * 来源id
+     */
+    @Column(name = "pr_sourceid")
+    private Long sourceId;
+
+    /**
+     * 来源id
+     */
+    @Column(name = "pr_tovendor")
+    private short toVendor;
+
     /**
      * 消息明细
      */
@@ -103,9 +127,11 @@ public class PagingRelease implements Serializable {
     @OrderBy("prd_id")
     private Set<PagingReleaseDetail> pagingReleaseDetails;
 
+    public PagingRelease() {
 
+    }
 
-    public PagingRelease(Long emUU, String emName, Long enUU, Date date, String codeValue, String from, String title, String context, String type) {
+    public PagingRelease(Long emUU, String emName, Long enUU, Date date, String codeValue, String from, String title, String context, String type, Short toVendor, String category, String table, Long sourceId) {
         this.emUU = emUU;
         this.emName = emName;
         this.enUU = enUU;
@@ -115,10 +141,10 @@ public class PagingRelease implements Serializable {
         this.title = title;
         this.context = context;
         this.type = type;
-    }
-
-    public PagingRelease() {
-
+        this.toVendor = toVendor;
+        this.category = category;
+        this.table = table;
+        this.sourceId = sourceId;
     }
 
     public Long getId() {
@@ -218,6 +244,38 @@ public class PagingRelease implements Serializable {
         this.type = type;
     }
 
+    public String getTable() {
+        return table;
+    }
+
+    public void setTable(String table) {
+        this.table = table;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public short getToVendor() {
+        return toVendor;
+    }
+
+    public void setToVendor(short toVendor) {
+        this.toVendor = toVendor;
+    }
+
     @JsonIgnore
     @JSONField(serialize = false)
     public Set<PagingReleaseDetail> getPagingReleaseDetails() {

+ 17 - 1
src/main/java/com/uas/platform/b2b/model/PagingReleaseDetail.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.model;
 
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.Status;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -87,6 +88,12 @@ public class PagingReleaseDetail implements Serializable{
     @Column(name = "prd_totalstatus")
     private Short totalStatus;
 
+    /**
+     * 单据状态
+     */
+    @Column(name = "prd_orderstatus")
+    private Short orderStatus;
+
     /**
      * 消息主表
      */
@@ -97,7 +104,7 @@ public class PagingReleaseDetail implements Serializable{
     public PagingReleaseDetail() {
     }
 
-    public PagingReleaseDetail(Long vendUU, Long vendUserUU, String vendUserName) {
+    public PagingReleaseDetail(Long vendUU, Long vendUserUU, String vendUserName, Short orderStatus) {
         this.vendUU = vendUU;
         this.vendUserUU = vendUserUU;
         this.vendUserName = vendUserName;
@@ -105,6 +112,7 @@ public class PagingReleaseDetail implements Serializable{
         this.status = Constant.NO;
         this.pushStatus = Constant.NO;
         this.totalStatus = Constant.NO;
+        this.orderStatus = orderStatus;
     }
 
     public Long getId() {
@@ -203,4 +211,12 @@ public class PagingReleaseDetail implements Serializable{
     public void setPagingRelease(PagingRelease pagingRelease) {
         this.pagingRelease = pagingRelease;
     }
+
+    public Short getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Short orderStatus) {
+        this.orderStatus = orderStatus;
+    }
 }