添加 仓库主表、明细表、库存总账字段

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWhgenleg.java

@@ -170,6 +170,12 @@ public class TWhgenleg extends BaseEntity {
     private BigDecimal fNetweightblc;
 
     /**
+     * 结余尺码
+     */
+    @Excel(name = "结余尺码")
+    private BigDecimal fVolumnblc;
+
+    /**
      * 箱号
      */
     @Excel(name = "箱号")
@@ -203,9 +209,11 @@ public class TWhgenleg extends BaseEntity {
      * 查询时间区间
      */
     private List<String> orgStorageDate;
+
     public void setorgStorageDate(List<String> orgStorageDate) {
         this.orgStorageDate = orgStorageDate;
     }
+
     public List<String> getorgStorageDate() {
         return orgStorageDate;
     }
@@ -534,6 +542,19 @@ public class TWhgenleg extends BaseEntity {
 
     }
 
+    public void setfVolumnblc(BigDecimal fVolumnblc) {
+
+        this.fVolumnblc = fVolumnblc;
+
+    }
+
+
+    public BigDecimal getfVolumnblc() {
+
+        return fVolumnblc;
+
+    }
+
     public void setfCntrno(String fCntrno) {
 
         this.fCntrno = fCntrno;
@@ -630,6 +651,7 @@ public class TWhgenleg extends BaseEntity {
                 .append("fGrossweightblc", getfGrossweightblc())
                 .append("fNetweightc", getfNetweightc())
                 .append("fNetweightblc", getfNetweightblc())
+                .append("fVolumnblc", getfVolumnblc())
                 .append("fCntrno", getfCntrno())
                 .append("fStatus", getfStatus())
                 .append("delFlag", getDelFlag())

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -262,6 +262,12 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "库存明细状态")
     private String fItemsStatus;
 
+    /**
+     *  仓储费计费截至日期
+     */
+    @Excel(name = "仓储费计费截至日期")
+    private Date fBillingDeadline;
+
 
     /**
      * 查询时间区间
@@ -618,6 +624,14 @@ public class TWarehouseBills extends BaseEntity {
         this.fItemsStatus = fItemsStatus;
     }
 
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
+    }
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -638,6 +652,7 @@ public class TWarehouseBills extends BaseEntity {
                 .append("fChargedate", getfChargedate())
                 .append("fBsdate", getfBsdate())
                 .append("fPlanqty", getfPlanqty())
+                .append("fBillingDeadline", getfBillingDeadline())
                 .append("fPlangrossweight", getfPlangrossweight())
                 .append("fPlannetweight", getfPlannetweight())
                 .append("fPlanvolumn", getfPlanvolumn())

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsitems.java

@@ -246,6 +246,24 @@ public class TWarehousebillsitems extends BaseEntity {
     private String fSerialNumber;
 
     /**
+     * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移）
+     */
+    @Excel(name = "单据类型")
+    private String fBilltype;
+
+    /**
+     * 计费数量
+     */
+    @Excel(name = "计费数量")
+    private BigDecimal fBillingQty;
+
+    /**
+     * 仓储费计费截至日期
+     */
+    @Excel(name = "仓储费计费截至日期")
+    private Date fBillingDeadline;
+
+    /**
      * 是否已放行(T为放行、F未放行)
      */
     @Excel(name = "是否已放行(T为放行、F未放行)")
@@ -555,6 +573,30 @@ public class TWarehousebillsitems extends BaseEntity {
         return fSerialNumber;
     }
 
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBillingQty(BigDecimal fBillingQty) {
+        this.fBillingQty = fBillingQty;
+    }
+
+    public BigDecimal getfBillingQty() {
+        return fBillingQty;
+    }
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
+    }
+
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
+    }
+
     public void setfIsPass(String fIsPass) {
         this.fIsPass = fIsPass;
     }
@@ -584,6 +626,9 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fPlanqty", getfPlanqty())
                 .append("fPlanvolumn", getfPlanvolumn())
                 .append("fPackagespecs", getfPackagespecs())
+                .append("fBilltype", getfBilltype())
+                .append("fBillingQty", getfBillingQty())
+                .append("fBillingDeadline", getfBillingDeadline())
                 .append("fChargedate", getfChargedate())
                 .append("fPlangrossweight", getfPlangrossweight())
                 .append("fPlannetweight", getfPlannetweight())