Merge remote-tracking branch 'origin/feature-material-wangcz' into feature-material-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/model/CommodityInOutbound.java

@@ -0,0 +1,196 @@
+package com.uas.platform.b2c.prod.commodity.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * 出入库的历史记录
+ */
+@Entity
+@Table(name = "trade$commodity_in_outbound")
+public class CommodityInOutbound implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 所属企业
+     */
+    @Column(name = "cio_enuu")
+    private Long enuu;
+
+    /**
+     * 所属企业的名称
+     */
+    @Column(name = "cio_enname")
+    private String enName;
+
+    /**
+     * 出入库单号
+     */
+    @Column(name = "cio_in_out_id")
+    private String inOutId;
+
+    /**
+     * 关联公司
+     * 出库对应买家公司
+     * 入库对应卖家公司
+     */
+    @Column(name = "cio_affiliated_enterprise")
+    private String affiliatedEnterprise;
+
+    /**
+     * 关联公司的企业uu
+     */
+    @Column(name = "cio_affiliated_enuu")
+    private Long affiliatedEnuu;
+
+    /**
+     * 出入库的记录
+     */
+    @Column(name = "cio_create_time")
+    private Date createTime;
+
+    /**
+     * 出入库类型
+     */
+    @Column(name = "cio_type")
+    private String type;
+
+    /**
+     * 其他出入库、销售出库，采购入库
+     */
+    @Column(name = "cio_opertator_type")
+    private String opertatorType;
+
+    /**
+     * 操作人
+     */
+    @Column(name = "cio_operator_useruu")
+    private Long operaterUseruu;
+
+    /**
+     * 操作人名称
+     */
+    @Column(name = "cio_operator_user_name")
+    private String operaterUserName;
+
+    @Column(name = "cio_associate_orderid")
+    private String associateOrderid;
+
+    /**
+     * 订单明细
+     */
+    @OneToMany(mappedBy = "commodityInOutbound", cascade = {CascadeType.ALL}, fetch = FetchType.EAGER)
+    @OrderBy("iobd_detno")
+    private Set<InOutboundDetail> inOutboundDetails;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEnuu() {
+        return enuu;
+    }
+
+    public void setEnuu(Long enuu) {
+        this.enuu = enuu;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getInOutId() {
+        return inOutId;
+    }
+
+    public void setInOutId(String inOutId) {
+        this.inOutId = inOutId;
+    }
+
+    public String getAffiliatedEnterprise() {
+        return affiliatedEnterprise;
+    }
+
+    public void setAffiliatedEnterprise(String affiliatedEnterprise) {
+        this.affiliatedEnterprise = affiliatedEnterprise;
+    }
+
+    public Long getAffiliatedEnuu() {
+        return affiliatedEnuu;
+    }
+
+    public void setAffiliatedEnuu(Long affiliatedEnuu) {
+        this.affiliatedEnuu = affiliatedEnuu;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getOpertatorType() {
+        return opertatorType;
+    }
+
+    public void setOpertatorType(String opertatorType) {
+        this.opertatorType = opertatorType;
+    }
+
+    public Long getOperaterUseruu() {
+        return operaterUseruu;
+    }
+
+    public void setOperaterUseruu(Long operaterUseruu) {
+        this.operaterUseruu = operaterUseruu;
+    }
+
+    public String getOperaterUserName() {
+        return operaterUserName;
+    }
+
+    public void setOperaterUserName(String operaterUserName) {
+        this.operaterUserName = operaterUserName;
+    }
+
+    public String getAssociateOrderid() {
+        return associateOrderid;
+    }
+
+    public void setAssociateOrderid(String associateOrderid) {
+        this.associateOrderid = associateOrderid;
+    }
+
+    public Set<InOutboundDetail> getInOutboundDetails() {
+        return inOutboundDetails;
+    }
+
+    public void setInOutboundDetails(Set<InOutboundDetail> inOutboundDetails) {
+        this.inOutboundDetails = inOutboundDetails;
+    }
+}

src/main/java/com/uas/platform/b2c/prod/commodity/model/InOutboundDetail.java

@@ -0,0 +1,173 @@
+package com.uas.platform.b2c.prod.commodity.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "trade$in_out_bound_detail")
+public class InOutboundDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "iobd_cmpcode")
+    private String cmpCode = "";
+
+    @Column(name = "iobd_cmpuuid")
+    private String cmpuuid = "";
+
+    @Column(name = "iobd_branden")
+    private String brandEn = "";
+
+    @Column(name = "iobd_brandcn")
+    private String brandCn = "";
+
+    @Column(name = "iobd_brandid")
+    private String brandId;
+
+    @Column(name = "iobd_kind_name")
+    private String kindName = "";
+
+    @Column(name = "iobd_kindid")
+    private Long kindId;
+
+    @Column(name = "iobd_spec")
+    private String spec = "";
+
+    @Column(name = "iobd_qty")
+    private Double qty;
+
+    @Column(name = "iobd_price")
+    private Double price;
+
+    @Column(name = "iobd_ciobid")
+    private Long ciobid;
+
+    @Column(name = "iobd_detno")
+    private Short detno;
+
+    @ManyToOne(cascade = {CascadeType.ALL}, optional = true)
+    @JoinColumn(name = "iobd_ciobid", nullable = false)
+    private CommodityInOutbound commodityInOutbound;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
+    }
+
+    public String getCmpuuid() {
+        return cmpuuid;
+    }
+
+    public void setCmpuuid(String cmpuuid) {
+        this.cmpuuid = cmpuuid;
+    }
+
+    public String getBrandEn() {
+        return brandEn;
+    }
+
+    public void setBrandEn(String brandEn) {
+        this.brandEn = brandEn;
+    }
+
+    public String getBrandCn() {
+        return brandCn;
+    }
+
+    public void setBrandCn(String brandCn) {
+        this.brandCn = brandCn;
+    }
+
+    public String getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(String brandId) {
+        this.brandId = brandId;
+    }
+
+    public String getKindName() {
+        return kindName;
+    }
+
+    public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+    public Long getKindId() {
+        return kindId;
+    }
+
+    public void setKindId(Long kindId) {
+        this.kindId = kindId;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public Double getQty() {
+        return qty;
+    }
+
+    public void setQty(Double qty) {
+        this.qty = qty;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Long getCiobid() {
+        return ciobid;
+    }
+
+    public void setCiobid(Long ciobid) {
+        this.ciobid = ciobid;
+    }
+
+    public Short getDetno() {
+        return detno;
+    }
+
+    public void setDetno(Short detno) {
+        this.detno = detno;
+    }
+
+    @JsonIgnore
+    @JSONField(serialize = false)
+    public CommodityInOutbound getCommodityInOutbound() {
+        return commodityInOutbound;
+    }
+
+    public void setCommodityInOutbound(CommodityInOutbound commodityInOutbound) {
+        this.commodityInOutbound = commodityInOutbound;
+    }
+}