diff --git a/src/main/java/com/yn/bftl/common/modules/good/entity/ErpInventoryInfo.java b/src/main/java/com/yn/bftl/common/modules/good/entity/ErpInventoryInfo.java index 1bb054a..c274957 100644 --- a/src/main/java/com/yn/bftl/common/modules/good/entity/ErpInventoryInfo.java +++ b/src/main/java/com/yn/bftl/common/modules/good/entity/ErpInventoryInfo.java @@ -42,28 +42,58 @@ private String spoke; //主键ID private Long iId = 0L; + //是否已同步创建商品 + private Boolean isSync = Boolean.FALSE; + + //商品大类编码 + private String cinvccode; + + //商品大类名称 + private String cinvcname; + + //计量单位编码 + private String ccomunitcode; + + //计量单位名称 + private String ccomunitname; + + //erp账套号 + private String erpCode; + private String attrs; - public ErpInventoryInfo() { - } + public ErpInventoryInfo() {} - public ErpInventoryInfo(String cinvcode, String cinvname, String ccurrencyname) { + public ErpInventoryInfo( + String cinvcode, + String cinvname, + String ccurrencyname, + String cinvccode, + String cinvcname, + String ccomunitcode, + String ccomunitname) { this.cinvcode = cinvcode; this.cinvname = cinvname; this.ccurrencyname = ccurrencyname; + this.cinvccode = cinvccode; + this.cinvcname = cinvcname; + this.ccomunitcode = ccomunitcode; + this.ccomunitname = ccomunitname; } + @Override public Long getId() { - return this.id; + return id; } + @Override public void setId(Long id) { this.id = id; } public String getCinvcode() { - return this.cinvcode; + return cinvcode; } public void setCinvcode(String cinvcode) { @@ -71,7 +101,7 @@ } public String getCinvname() { - return this.cinvname; + return cinvname; } public void setCinvname(String cinvname) { @@ -79,7 +109,7 @@ } public String getCcurrencyname() { - return this.ccurrencyname; + return ccurrencyname; } public void setCcurrencyname(String ccurrencyname) { @@ -87,7 +117,7 @@ } public String getCinvstd() { - return this.cinvstd; + return cinvstd; } public void setCinvstd(String cinvstd) { @@ -95,7 +125,7 @@ } public String getPaintingcolor() { - return this.paintingcolor; + return paintingcolor; } public void setPaintingcolor(String paintingcolor) { @@ -103,7 +133,7 @@ } public String getSpoke() { - return this.spoke; + return spoke; } public void setSpoke(String spoke) { @@ -111,39 +141,105 @@ } public Long getiId() { - return this.iId == null ? 0L : this.iId; + return iId == null ? 0L : iId; } public void setiId(Long iId) { this.iId = iId; } + public Boolean getIsSync() { + return isSync == null ? Boolean.FALSE : isSync; + } + + public void setIsSync(Boolean isSync) { + this.isSync = isSync; + } + + public String getCinvccode() { + return cinvccode; + } + + public void setCinvccode(String cinvccode) { + this.cinvccode = cinvccode; + } + + public String getCinvcname() { + return cinvcname; + } + + public void setCinvcname(String cinvcname) { + this.cinvcname = cinvcname; + } + + public String getCcomunitcode() { + return ccomunitcode; + } + + public void setCcomunitcode(String ccomunitcode) { + this.ccomunitcode = ccomunitcode; + } + + public String getCcomunitname() { + return ccomunitname; + } + + public void setCcomunitname(String ccomunitname) { + this.ccomunitname = ccomunitname; + } + + public String getErpCode() { + return erpCode; + } + + public void setErpCode(String erpCode) { + this.erpCode = erpCode; + } + public String getAttrs() { - return this.attrs; + return attrs; } public void setAttrs(String attrs) { this.attrs = attrs; } + @Override public boolean equals(Object obj) { - if (obj == null) { - return false; - } else if (this == obj) { - return true; - } else if (!(obj instanceof ErpInventoryInfo)) { - return false; - } else { - ErpInventoryInfo other = (ErpInventoryInfo)obj; - return this.getId() == null && other.getId() == null ? false : Objects.equals(this.getId(), other.getId()); + if (obj == null) return false; + if (this == obj) return true; + if (!(obj instanceof ErpInventoryInfo)) return false; + + final ErpInventoryInfo other = (ErpInventoryInfo) obj; + if (this.getId() != null || other.getId() != null) { + return Objects.equals(this.getId(), other.getId()); } + + return false; } + @Override public int hashCode() { return 31; } + @Override public String toString() { - return MoreObjects.toStringHelper(this).add("id", this.getId()).add("cinvcode", this.getCinvcode()).add("cinvname", this.getCinvname()).add("ccurrencyname", this.getCcurrencyname()).add("cinvstd", this.getCinvstd()).add("paintingcolor", this.getPaintingcolor()).add("spoke", this.getSpoke()).add("iId", this.getiId()).omitNullValues().toString(); + return MoreObjects.toStringHelper(this) + .add("id", getId()) + .add("cinvcode", getCinvcode()) + .add("cinvname", getCinvname()) + .add("ccurrencyname", getCcurrencyname()) + .add("cinvstd", getCinvstd()) + .add("paintingcolor", getPaintingcolor()) + .add("spoke", getSpoke()) + .add("iId", getiId()) + .add("isSync", getIsSync()) + .add("cinvccode", getCinvccode()) + .add("cinvcname", getCinvcname()) + .add("ccomunitcode", getCcomunitcode()) + .add("erpCode", getErpCode()) + .omitNullValues() + .toString(); } }