|
@@ -1,5 +1,6 @@
|
|
|
package com.ruoyi.warehouseBusiness.domain;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import com.ruoyi.common.annotation.Excel;
|
|
|
import com.ruoyi.common.core.domain.BaseEntity;
|
|
@@ -37,6 +38,12 @@ public class TWarehousebillsfees extends BaseEntity {
|
|
|
private Long fLineno;
|
|
|
|
|
|
/**
|
|
|
+ * 仓库id
|
|
|
+ */
|
|
|
+ @Excel(name = "仓库id")
|
|
|
+ private Long fWarehouseid;
|
|
|
+
|
|
|
+ /**
|
|
|
* 客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name
|
|
|
*/
|
|
|
@Excel(name = "客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name")
|
|
@@ -250,11 +257,15 @@ public class TWarehousebillsfees extends BaseEntity {
|
|
|
@Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
|
|
|
private String fBilltype;
|
|
|
|
|
|
- /** 入(出)库日期 */
|
|
|
+ /**
|
|
|
+ * 入(出)库日期
|
|
|
+ */
|
|
|
@Excel(name = "入", readConverterExp = "出=")
|
|
|
private Date fBsdate;
|
|
|
|
|
|
- /** 入库日期(原始) */
|
|
|
+ /**
|
|
|
+ * 入库日期(原始)
|
|
|
+ */
|
|
|
@Excel(name = "入库日期", readConverterExp = "原=始")
|
|
|
private Date fOriginalbilldate;
|
|
|
|
|
@@ -270,7 +281,9 @@ public class TWarehousebillsfees extends BaseEntity {
|
|
|
@Excel(name = "结算方式,默认提取corps中stltypeid 也可以从表t_stltypes中下拉选择,存储id,显示name")
|
|
|
private Long fStltypeid;
|
|
|
|
|
|
- /** 业务类型(存汉字的,用来区别 如: 来车提货,出库装箱 区别) */
|
|
|
+ /**
|
|
|
+ * 业务类型(存汉字的,用来区别 如: 来车提货,出库装箱 区别)
|
|
|
+ */
|
|
|
@Excel(name = "业务类型(存汉字的,用来区别 如: 来车提货,出库装箱 区别)")
|
|
|
private String fBusinessType;
|
|
|
|
|
@@ -298,6 +311,18 @@ public class TWarehousebillsfees extends BaseEntity {
|
|
|
//状态中文
|
|
|
private String fBillstatusName;
|
|
|
|
|
|
+ // 仓库名称
|
|
|
+ @TableField(exist = false)
|
|
|
+ private String warehouseName;
|
|
|
+
|
|
|
+ public String getWarehouseName() {
|
|
|
+ return warehouseName;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setWarehouseName(String warehouseName) {
|
|
|
+ this.warehouseName = warehouseName;
|
|
|
+ }
|
|
|
+
|
|
|
public String getfBillstatusName() {
|
|
|
return fBillstatusName;
|
|
|
}
|
|
@@ -312,7 +337,7 @@ public class TWarehousebillsfees extends BaseEntity {
|
|
|
private String fYears;
|
|
|
|
|
|
/**
|
|
|
- * 月份
|
|
|
+ * 月份
|
|
|
*/
|
|
|
private List<String> fMonth;
|
|
|
|
|
@@ -701,55 +726,68 @@ public class TWarehousebillsfees extends BaseEntity {
|
|
|
this.fBusinessType = fBusinessType;
|
|
|
}
|
|
|
|
|
|
+ public Long getfWarehouseid() {
|
|
|
+ return fWarehouseid;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setfWarehouseid(Long fWarehouseid) {
|
|
|
+ this.fWarehouseid = fWarehouseid;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public String toString() {
|
|
|
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
|
|
- .append("fId", getfId())
|
|
|
- .append("fPid", getfPid())
|
|
|
- .append("fLineno", getfLineno())
|
|
|
- .append("fCorpid", getfCorpid())
|
|
|
- .append("fFeeid", getfFeeid())
|
|
|
- .append("fFeeunitid", getfFeeunitid())
|
|
|
- .append("fQty", getfQty())
|
|
|
- .append("fUnitprice", getfUnitprice())
|
|
|
- .append("fAmount", getfAmount())
|
|
|
- .append("fCurrency", getfCurrency())
|
|
|
- .append("fExrate", getfExrate())
|
|
|
- .append("fTaxrate", getfTaxrate())
|
|
|
- .append("fDc", getfDc())
|
|
|
- .append("fBillstatus", getfBillstatus())
|
|
|
- .append("fReviewDate", getfReviewDate())
|
|
|
- .append("fAccamount", getfAccamount())
|
|
|
- .append("fStatementNo", getfStatementNo())
|
|
|
- .append("fStlamount", getfStlamount())
|
|
|
- .append("fInvnos", getfInvnos())
|
|
|
- .append("fAccamountDate", getfAccamountDate())
|
|
|
- .append("fInvamount", getfInvamount())
|
|
|
- .append("fStlamountNo", getfStlamountNo())
|
|
|
- .append("fAskamount", getfAskamount())
|
|
|
- .append("fStatus", getfStatus())
|
|
|
- .append("fStlamountDate", getfStlamountDate())
|
|
|
- .append("delFlag", getDelFlag())
|
|
|
- .append("createBy", getCreateBy())
|
|
|
- .append("createTime", getCreateTime())
|
|
|
- .append("updateBy", getUpdateBy())
|
|
|
- .append("updateTime", getUpdateTime())
|
|
|
- .append("remark", getRemark())
|
|
|
- .append("srcId", getSrcId())
|
|
|
- .append("srcBillNo", getSrcBillNo())
|
|
|
- .append("fMblno", getfMblno())
|
|
|
- .append("fProductName", getfProductName())
|
|
|
- .append("fOriginalbilldate", getfOriginalbilldate())
|
|
|
- .append("fBsdate", getfBsdate())
|
|
|
- .append("fMarks", getfMarks())
|
|
|
- .append("fChargedate", getfChargedate())
|
|
|
- .append("fBillingDeadline", getfBillingDeadline())
|
|
|
- .append("fInventoryDays", getfInventoryDays())
|
|
|
- .append("fAmt", getfAmt())
|
|
|
- .append("fBillingDays", getfBillingDays())
|
|
|
- .append("fBillingQty", getfBillingQty())
|
|
|
- .append("fBilltype", getfBilltype())
|
|
|
- .append("fBillingway", getfBillingway())
|
|
|
- .toString();
|
|
|
+ return "TWarehousebillsfees{" +
|
|
|
+ "fId=" + fId +
|
|
|
+ ", fPid=" + fPid +
|
|
|
+ ", fLineno=" + fLineno +
|
|
|
+ ", fWarehouseid=" + fWarehouseid +
|
|
|
+ ", fCorpid=" + fCorpid +
|
|
|
+ ", fFeeid=" + fFeeid +
|
|
|
+ ", fFeeunitid=" + fFeeunitid +
|
|
|
+ ", fQty=" + fQty +
|
|
|
+ ", fUnitprice=" + fUnitprice +
|
|
|
+ ", fAmount=" + fAmount +
|
|
|
+ ", fCurrency='" + fCurrency + '\'' +
|
|
|
+ ", fExrate=" + fExrate +
|
|
|
+ ", fTaxrate=" + fTaxrate +
|
|
|
+ ", fDc='" + fDc + '\'' +
|
|
|
+ ", fBillstatus=" + fBillstatus +
|
|
|
+ ", fReviewDate=" + fReviewDate +
|
|
|
+ ", fAccamount=" + fAccamount +
|
|
|
+ ", fStatementNo='" + fStatementNo + '\'' +
|
|
|
+ ", fStlamount=" + fStlamount +
|
|
|
+ ", fInvnos='" + fInvnos + '\'' +
|
|
|
+ ", fAccamountDate=" + fAccamountDate +
|
|
|
+ ", fInvamount=" + fInvamount +
|
|
|
+ ", fStlamountNo='" + fStlamountNo + '\'' +
|
|
|
+ ", fAskamount=" + fAskamount +
|
|
|
+ ", fStatus='" + fStatus + '\'' +
|
|
|
+ ", fStlamountDate=" + fStlamountDate +
|
|
|
+ ", delFlag='" + delFlag + '\'' +
|
|
|
+ ", srcId=" + srcId +
|
|
|
+ ", srcBillNo='" + srcBillNo + '\'' +
|
|
|
+ ", fMblno='" + fMblno + '\'' +
|
|
|
+ ", fProductName='" + fProductName + '\'' +
|
|
|
+ ", fMarks='" + fMarks + '\'' +
|
|
|
+ ", fChargedate=" + fChargedate +
|
|
|
+ ", fBillingDeadline=" + fBillingDeadline +
|
|
|
+ ", fInventoryDays=" + fInventoryDays +
|
|
|
+ ", fAmt=" + fAmt +
|
|
|
+ ", fBillingDays=" + fBillingDays +
|
|
|
+ ", fBillingQty=" + fBillingQty +
|
|
|
+ ", fBilltype='" + fBilltype + '\'' +
|
|
|
+ ", fBsdate=" + fBsdate +
|
|
|
+ ", fOriginalbilldate=" + fOriginalbilldate +
|
|
|
+ ", fBillingway=" + fBillingway +
|
|
|
+ ", fStltypeid=" + fStltypeid +
|
|
|
+ ", fBusinessType='" + fBusinessType + '\'' +
|
|
|
+ ", fBsdateList=" + fBsdateList +
|
|
|
+ ", fSrcTypeId=" + fSrcTypeId +
|
|
|
+ ", corpName='" + corpName + '\'' +
|
|
|
+ ", feeName='" + feeName + '\'' +
|
|
|
+ ", fBillstatusName='" + fBillstatusName + '\'' +
|
|
|
+ ", fYears='" + fYears + '\'' +
|
|
|
+ ", fMonth=" + fMonth +
|
|
|
+ '}';
|
|
|
}
|
|
|
}
|