添加 仓库主表、仓库费用明细表、仓库明细表字段

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TFeeDoController.java

@@ -1,90 +0,0 @@
-package com.ruoyi.web.controller.warehouse.finance;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.finance.domain.TFeeDo;
-import com.ruoyi.finance.service.ITFeeDoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 财务数据明细Controller
- *
- * @author ruoyi
- * @date 2021-01-18
- */
-@RestController
-@RequestMapping("/warehouse/do")
-public class TFeeDoController extends BaseController {
-    @Autowired
-    private ITFeeDoService tFeeDoService;
-
-    /**
-     * 查询财务数据明细列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouse:do:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TFeeDo tFeeDo) {
-        startPage();
-        List<TFeeDo> list = tFeeDoService.selectTFeeDoList(tFeeDo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出财务数据明细列表
-     */
-    @PreAuthorize("@ss.hasPermi('warehouse:do:export')")
-    @Log(title = "财务数据明细", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TFeeDo tFeeDo) {
-        List<TFeeDo> list = tFeeDoService.selectTFeeDoList(tFeeDo);
-        ExcelUtil<TFeeDo> util = new ExcelUtil<TFeeDo>(TFeeDo.class);
-        return util.exportExcel(list, "do");
-    }
-
-    /**
-     * 获取财务数据明细详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('warehouse:do:query')")
-    @GetMapping(value = "/{fId}")
-    public AjaxResult getInfo(@PathVariable("fId") Long fId) {
-        return AjaxResult.success(tFeeDoService.selectTFeeDoById(fId));
-    }
-
-    /**
-     * 新增财务数据明细
-     */
-    @PreAuthorize("@ss.hasPermi('warehouse:do:add')")
-    @Log(title = "财务数据明细", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TFeeDo tFeeDo) {
-        return toAjax(tFeeDoService.insertTFeeDo(tFeeDo));
-    }
-
-    /**
-     * 修改财务数据明细
-     */
-    @PreAuthorize("@ss.hasPermi('warehouse:do:edit')")
-    @Log(title = "财务数据明细", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TFeeDo tFeeDo) {
-        return toAjax(tFeeDoService.updateTFeeDo(tFeeDo));
-    }
-
-    /**
-     * 删除财务数据明细
-     */
-    @PreAuthorize("@ss.hasPermi('warehouse:do:remove')")
-    @Log(title = "财务数据明细", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{fIds}")
-    public AjaxResult remove(@PathVariable Long[] fIds) {
-        return toAjax(tFeeDoService.deleteTFeeDoByIds(fIds));
-    }
-}

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

@@ -189,6 +189,10 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "计费单位(数据字典),下拉选择毛重或净重")
     private String fFeetunit;
 
+    /** 明细品名合计 */
+    @Excel(name = "明细品名合计")
+    private String fProductName;
+
     /**
      * 提单号
      */
@@ -512,6 +516,14 @@ public class TWarehouseBills extends BaseEntity {
         return fFeetunit;
     }
 
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    public String getfProductName() {
+        return fProductName;
+    }
+
     public void setfMblno(String fMblno) {
         this.fMblno = fMblno;
     }
@@ -664,6 +676,7 @@ public class TWarehouseBills extends BaseEntity {
                 .append("fBillingway", getfBillingway())
                 .append("fSbu", getfSbu())
                 .append("fFeetunit", getfFeetunit())
+                .append("fProductName", getfProductName())
                 .append("fMblno", getfMblno())
                 .append("fVslvoy", getfVslvoy())
                 .append("fMarks", getfMarks())

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

@@ -1,12 +1,13 @@
 package com.ruoyi.warehouseBusiness.domain;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 仓库费用明细对象 t_warehousebillsfees
@@ -50,7 +51,7 @@ public class TWarehousebillsfees extends BaseEntity {
      * 计价单位(数据字典),对应，t_unitfees f_id，如果选择为毛重，数量（f_qty）取主表的毛重，如果选择净重，取主表的净重，如果为箱量，取主表的箱量
      */
     @Excel(name = "计价单位(数据字典),对应，t_unitfees f_id，如果选择为毛重，数量", readConverterExp = "f=_qty")
-    private Long fFeeUnitid;
+    private Long fFeeunitid;
 
     /**
      * 数量
@@ -68,7 +69,7 @@ public class TWarehousebillsfees extends BaseEntity {
      * 金额,2位小数f_qty* f_amount
      */
     @Excel(name = "金额,2位小数f_qty* f_amount")
-    private BigDecimal fAmount;
+    private Long fAmount;
 
     /**
      * 币别
@@ -104,13 +105,19 @@ public class TWarehousebillsfees extends BaseEntity {
      * 对账金额
      */
     @Excel(name = "对账金额")
-    private BigDecimal fAccamount;
+    private Long fAccamount;
+
+    /**
+     * 对账单号
+     */
+    @Excel(name = "对账单号")
+    private String fStatementNo;
 
     /**
      * 结算金额
      */
     @Excel(name = "结算金额")
-    private BigDecimal fStlamount;
+    private Long fStlamount;
 
     /**
      * 发票号
@@ -119,16 +126,36 @@ public class TWarehousebillsfees extends BaseEntity {
     private String fInvnos;
 
     /**
+     * 对账日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "对账日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fAccamountDate;
+
+    /**
      * 开票金额
      */
     @Excel(name = "开票金额")
-    private BigDecimal fInvamount;
+    private Long fInvamount;
+
+    /**
+     * 结算单号
+     */
+    @Excel(name = "结算单号")
+    private String fStlamountNo;
 
     /**
      * 申请金额
      */
     @Excel(name = "申请金额")
-    private BigDecimal fAskamount;
+    private Long fAskamount;
+
+    /**
+     * 结算日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结算日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fStlamountDate;
 
     /**
      * 状态
@@ -139,7 +166,6 @@ public class TWarehousebillsfees extends BaseEntity {
     /**
      * 删除状态
      */
-    @TableLogic
     private String delFlag;
 
     public void setfId(Long fId) {
@@ -182,12 +208,12 @@ public class TWarehousebillsfees extends BaseEntity {
         return fFeeid;
     }
 
-    public void setfFeeUnitid(Long fFeeUnitid) {
-        this.fFeeUnitid = fFeeUnitid;
+    public void setfFeeunitid(Long fFeeunitid) {
+        this.fFeeunitid = fFeeunitid;
     }
 
-    public Long getfFeeUnitid() {
-        return fFeeUnitid;
+    public Long getfFeeunitid() {
+        return fFeeunitid;
     }
 
     public void setfQty(BigDecimal fQty) {
@@ -206,11 +232,11 @@ public class TWarehousebillsfees extends BaseEntity {
         return fUnitprice;
     }
 
-    public void setfAmount(BigDecimal fAmount) {
+    public void setfAmount(Long fAmount) {
         this.fAmount = fAmount;
     }
 
-    public BigDecimal getfAmount() {
+    public Long getfAmount() {
         return fAmount;
     }
 
@@ -254,19 +280,27 @@ public class TWarehousebillsfees extends BaseEntity {
         return fBillstatus;
     }
 
-    public void setfAccamount(BigDecimal fAccamount) {
+    public void setfAccamount(Long fAccamount) {
         this.fAccamount = fAccamount;
     }
 
-    public BigDecimal getfAccamount() {
+    public Long getfAccamount() {
         return fAccamount;
     }
 
-    public void setfStlamount(BigDecimal fStlamount) {
+    public void setfStatementNo(String fStatementNo) {
+        this.fStatementNo = fStatementNo;
+    }
+
+    public String getfStatementNo() {
+        return fStatementNo;
+    }
+
+    public void setfStlamount(Long fStlamount) {
         this.fStlamount = fStlamount;
     }
 
-    public BigDecimal getfStlamount() {
+    public Long getfStlamount() {
         return fStlamount;
     }
 
@@ -278,22 +312,46 @@ public class TWarehousebillsfees extends BaseEntity {
         return fInvnos;
     }
 
-    public void setfInvamount(BigDecimal fInvamount) {
+    public void setfAccamountDate(Date fAccamountDate) {
+        this.fAccamountDate = fAccamountDate;
+    }
+
+    public Date getfAccamountDate() {
+        return fAccamountDate;
+    }
+
+    public void setfInvamount(Long fInvamount) {
         this.fInvamount = fInvamount;
     }
 
-    public BigDecimal getfInvamount() {
+    public Long getfInvamount() {
         return fInvamount;
     }
 
-    public void setfAskamount(BigDecimal fAskamount) {
+    public void setfStlamountNo(String fStlamountNo) {
+        this.fStlamountNo = fStlamountNo;
+    }
+
+    public String getfStlamountNo() {
+        return fStlamountNo;
+    }
+
+    public void setfAskamount(Long fAskamount) {
         this.fAskamount = fAskamount;
     }
 
-    public BigDecimal getfAskamount() {
+    public Long getfAskamount() {
         return fAskamount;
     }
 
+    public void setfStlamountDate(Date fStlamountDate) {
+        this.fStlamountDate = fStlamountDate;
+    }
+
+    public Date getfStlamountDate() {
+        return fStlamountDate;
+    }
+
     public void setfStatus(String fStatus) {
         this.fStatus = fStatus;
     }
@@ -318,7 +376,7 @@ public class TWarehousebillsfees extends BaseEntity {
                 .append("fLineno", getfLineno())
                 .append("fCorpid", getfCorpid())
                 .append("fFeeid", getfFeeid())
-                .append("fFeeUnitid", getfFeeUnitid())
+                .append("fFeeunitid", getfFeeunitid())
                 .append("fQty", getfQty())
                 .append("fUnitprice", getfUnitprice())
                 .append("fAmount", getfAmount())
@@ -328,10 +386,14 @@ public class TWarehousebillsfees extends BaseEntity {
                 .append("fDc", getfDc())
                 .append("fBillstatus", getfBillstatus())
                 .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("fStlamountDate", getfStlamountDate())
                 .append("fStatus", getfStatus())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())

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

@@ -42,6 +42,12 @@ public class TWarehousebillsitems extends BaseEntity {
     private Long fGoodsid;
 
     /**
+     * 业务编号,保存主表的
+     */
+    @Excel(name = "业务编号,保存主表的")
+    private String fBillno;
+
+    /**
      * 提单号
      */
     @Excel(name = "提单号")
@@ -54,18 +60,18 @@ public class TWarehousebillsitems extends BaseEntity {
     private Long fWarehouselocid;
 
     /**
-     * 入（出）库日期
-     */
-    @Excel(name = "入", readConverterExp = "出=")
-    private Date fBsdate;
-
-    /**
      * 原始入库业务编号
      */
     @Excel(name = "原始入库业务编号")
     private String fOriginalbillno;
 
     /**
+     * 入（出）库日期
+     */
+    @Excel(name = "入", readConverterExp = "出=")
+    private Date fBsdate;
+
+    /**
      * 箱号
      */
     @Excel(name = "箱号")
@@ -78,12 +84,6 @@ public class TWarehousebillsitems extends BaseEntity {
     private Long fCntqty;
 
     /**
-     * 业务编号,保存主表的
-     */
-    @Excel(name = "业务编号,保存主表的")
-    private String fBillno;
-
-    /**
      * 货值
      */
     @Excel(name = "货值")
@@ -96,35 +96,43 @@ public class TWarehousebillsitems extends BaseEntity {
     private String fCntrtype;
 
     /**
-     * 计费方式(数据字典)
-     */
-    @Excel(name = "计费方式(数据字典)")
-    private Long fBillingway;
-
-    /** 入库日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fOriginalbilldate;
-
-    /**
      * 计划件数
      */
     @Excel(name = "计划件数")
     private Long fPlanqty;
 
     /**
+     * 计费方式(数据字典)
+     */
+    @Excel(name = "计费方式(数据字典)")
+    private Long fBillingway;
+
+    /**
      * 计划尺码
      */
     @Excel(name = "计划尺码")
     private BigDecimal fPlanvolumn;
 
     /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fOriginalbilldate;
+
+    /**
      * 包装规格
      */
     @Excel(name = "包装规格")
     private Long fPackagespecs;
 
     /**
+     * 计划毛重
+     */
+    @Excel(name = "计划毛重")
+    private BigDecimal fPlangrossweight;
+
+    /**
      * 仓储计费日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -132,12 +140,6 @@ public class TWarehousebillsitems extends BaseEntity {
     private Date fChargedate;
 
     /**
-     * 计划毛重
-     */
-    @Excel(name = "计划毛重")
-    private BigDecimal fPlangrossweight;
-
-    /**
      * 计划净重
      */
     @Excel(name = "计划净重")
@@ -203,13 +205,6 @@ public class TWarehousebillsitems extends BaseEntity {
     private Long fInventoryDays;
 
     /**
-     * 仓储费截至日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "仓储费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fStorageFeeDeadline;
-
-    /**
      * 金额
      */
     @Excel(name = "金额")
@@ -246,9 +241,15 @@ public class TWarehousebillsitems extends BaseEntity {
     private String fSerialNumber;
 
     /**
+     * 是否已放行(T为放行、F未放行)
+     */
+    @Excel(name = "是否已放行(T为放行、F未放行)")
+    private String fIsPass;
+
+    /**
      * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移）
      */
-    @Excel(name = "单据类型")
+    @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
     private String fBilltype;
 
     /**
@@ -260,15 +261,10 @@ public class TWarehousebillsitems extends BaseEntity {
     /**
      * 仓储费计费截至日期
      */
-    @Excel(name = "仓储费计费截至日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储费计费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fBillingDeadline;
 
-    /**
-     * 是否已放行(T为放行、F未放行)
-     */
-    @Excel(name = "是否已放行(T为放行、F未放行)")
-    private String fIsPass;
-
     public void setfId(Long fId) {
         this.fId = fId;
     }
@@ -301,6 +297,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fGoodsid;
     }
 
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
     public void setfMblno(String fMblno) {
         this.fMblno = fMblno;
     }
@@ -317,14 +321,6 @@ public class TWarehousebillsitems extends BaseEntity {
         return fWarehouselocid;
     }
 
-    public void setfBsdate(Date fBsdate) {
-        this.fBsdate = fBsdate;
-    }
-
-    public Date getfBsdate() {
-        return fBsdate;
-    }
-
     public void setfOriginalbillno(String fOriginalbillno) {
         this.fOriginalbillno = fOriginalbillno;
     }
@@ -333,6 +329,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fOriginalbillno;
     }
 
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
     public void setfBoxno(String fBoxno) {
         this.fBoxno = fBoxno;
     }
@@ -365,36 +369,20 @@ public class TWarehousebillsitems extends BaseEntity {
         return fCntrtype;
     }
 
-    public void setfBillingway(Long fBillingway) {
-        this.fBillingway = fBillingway;
-    }
-
-    public Long getfBillingway() {
-        return fBillingway;
-    }
-
-    public void setfOriginalbilldate(Date fOriginalbilldate) {
-        this.fOriginalbilldate = fOriginalbilldate;
-    }
-
-    public Date getfOriginalbilldate() {
-        return fOriginalbilldate;
-    }
-
     public void setfPlanqty(Long fPlanqty) {
         this.fPlanqty = fPlanqty;
     }
 
-    public void setfBillno(String fBillno) {
-        this.fBillno = fBillno;
+    public Long getfPlanqty() {
+        return fPlanqty;
     }
 
-    public String getfBillno() {
-        return fBillno;
+    public void setfBillingway(Long fBillingway) {
+        this.fBillingway = fBillingway;
     }
 
-    public Long getfPlanqty() {
-        return fPlanqty;
+    public Long getfBillingway() {
+        return fBillingway;
     }
 
     public void setfPlanvolumn(BigDecimal fPlanvolumn) {
@@ -405,20 +393,20 @@ public class TWarehousebillsitems extends BaseEntity {
         return fPlanvolumn;
     }
 
-    public void setfPackagespecs(Long fPackagespecs) {
-        this.fPackagespecs = fPackagespecs;
+    public void setfOriginalbilldate(Date fOriginalbilldate) {
+        this.fOriginalbilldate = fOriginalbilldate;
     }
 
-    public Long getfPackagespecs() {
-        return fPackagespecs;
+    public Date getfOriginalbilldate() {
+        return fOriginalbilldate;
     }
 
-    public void setfChargedate(Date fChargedate) {
-        this.fChargedate = fChargedate;
+    public void setfPackagespecs(Long fPackagespecs) {
+        this.fPackagespecs = fPackagespecs;
     }
 
-    public Date getfChargedate() {
-        return fChargedate;
+    public Long getfPackagespecs() {
+        return fPackagespecs;
     }
 
     public void setfPlangrossweight(BigDecimal fPlangrossweight) {
@@ -429,6 +417,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fPlangrossweight;
     }
 
+    public void setfChargedate(Date fChargedate) {
+        this.fChargedate = fChargedate;
+    }
+
+    public Date getfChargedate() {
+        return fChargedate;
+    }
+
     public void setfPlannetweight(BigDecimal fPlannetweight) {
         this.fPlannetweight = fPlannetweight;
     }
@@ -517,14 +513,6 @@ public class TWarehousebillsitems extends BaseEntity {
         return fInventoryDays;
     }
 
-    public void setfStorageFeeDeadline(Date fStorageFeeDeadline) {
-        this.fStorageFeeDeadline = fStorageFeeDeadline;
-    }
-
-    public Date getfStorageFeeDeadline() {
-        return fStorageFeeDeadline;
-    }
-
     public void setfAmt(BigDecimal fAmt) {
         this.fAmt = fAmt;
     }
@@ -573,6 +561,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fSerialNumber;
     }
 
+    public void setfIsPass(String fIsPass) {
+        this.fIsPass = fIsPass;
+    }
+
+    public String getfIsPass() {
+        return fIsPass;
+    }
+
     public void setfBilltype(String fBilltype) {
         this.fBilltype = fBilltype;
     }
@@ -597,40 +593,29 @@ public class TWarehousebillsitems extends BaseEntity {
         return fBillingDeadline;
     }
 
-    public void setfIsPass(String fIsPass) {
-        this.fIsPass = fIsPass;
-    }
-
-    public String getfIsPass() {
-        return fIsPass;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("fId", getfId())
                 .append("fPid", getfPid())
                 .append("fLineno", getfLineno())
-                .append("fBillno", getfBillno())
                 .append("fGoodsid", getfGoodsid())
+                .append("fBillno", getfBillno())
                 .append("fMblno", getfMblno())
                 .append("fWarehouselocid", getfWarehouselocid())
-                .append("fBsdate", getfBsdate())
                 .append("fOriginalbillno", getfOriginalbillno())
+                .append("fBsdate", getfBsdate())
                 .append("fBoxno", getfBoxno())
                 .append("fCntqty", getfCntqty())
                 .append("fGoodsval", getfGoodsval())
                 .append("fCntrtype", getfCntrtype())
-                .append("fBillingway", getfBillingway())
-                .append("fOriginalbilldate", getfOriginalbilldate())
                 .append("fPlanqty", getfPlanqty())
+                .append("fBillingway", getfBillingway())
                 .append("fPlanvolumn", getfPlanvolumn())
+                .append("fOriginalbilldate", getfOriginalbilldate())
                 .append("fPackagespecs", getfPackagespecs())
-                .append("fBilltype", getfBilltype())
-                .append("fBillingQty", getfBillingQty())
-                .append("fBillingDeadline", getfBillingDeadline())
-                .append("fChargedate", getfChargedate())
                 .append("fPlangrossweight", getfPlangrossweight())
+                .append("fChargedate", getfChargedate())
                 .append("fPlannetweight", getfPlannetweight())
                 .append("fQty", getfQty())
                 .append("fVolumn", getfVolumn())
@@ -647,7 +632,6 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("remark", getRemark())
                 .append("fMarks", getfMarks())
                 .append("fInventoryDays", getfInventoryDays())
-                .append("fStorageFeeDeadline", getfStorageFeeDeadline())
                 .append("fAmt", getfAmt())
                 .append("fBillingDays", getfBillingDays())
                 .append("fDriverName", getfDriverName())
@@ -655,6 +639,9 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fDriverIdCar", getfDriverIdCar())
                 .append("fSerialNumber", getfSerialNumber())
                 .append("fIsPass", getfIsPass())
+                .append("fBilltype", getfBilltype())
+                .append("fBillingQty", getfBillingQty())
+                .append("fBillingDeadline", getfBillingDeadline())
                 .toString();
     }
 }

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -52,10 +52,11 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="fBillingDeadline" column="f_billing_deadline"/>
+        <result property="fProductName" column="f_product_name"/>
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
-        select f_id, f_billno, f_customsdeclartion, f_originalbillno, f_deptid, f_bsdeptid, f_contacts, f_tel, f_corpid, f_tocorpid, f_stltypeid, f_bscorpno, f_warehouseid, f_storekeeper, f_bsdate, f_chargedate, f_planqty, f_plangrossweight, f_plannetweight, f_planvolumn, f_qty, f_grossweight, f_netweight, f_volumn, f_trademodeid, f_billingway, f_sbu, f_feetunit, f_mblno, f_vslvoy, f_marks, f_eta, f_customno, f_ifweigh, f_ifpledge, f_ifdamage, f_bankcorpid, f_billtype, f_billstatus, del_flag, create_by, create_time, update_by, f_items_status, update_time, remark, f_billing_deadline from t_warehousebills
+        select f_id, f_billno, f_customsdeclartion, f_originalbillno, f_deptid, f_bsdeptid, f_contacts, f_tel, f_corpid, f_tocorpid, f_stltypeid, f_bscorpno, f_warehouseid, f_storekeeper, f_chargedate, f_bsdate, f_planqty, f_plangrossweight, f_plannetweight, f_planvolumn, f_qty, f_grossweight, f_netweight, f_volumn, f_trademodeid, f_billingway, f_sbu, f_feetunit, f_mblno, f_vslvoy, f_marks, f_eta, f_customno, f_ifweigh, f_ifpledge, f_ifdamage, f_bankcorpid, f_billtype, f_billstatus, del_flag, create_by, create_time, update_by, f_items_status, update_time, remark, f_billing_deadline, f_product_name from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -85,6 +86,7 @@
             <if test="fStorekeeper != null  and fStorekeeper != ''">and f_storekeeper = #{fStorekeeper}</if>
             <if test="fBsdate != null ">and f_bsdate = #{fBsdate}</if>
             <if test="fPlanqty != null ">and f_planqty = #{fPlanqty}</if>
+            <if test="fProductName != null  and fProductName != ''"> and f_product_name like concat('%', #{fProductName}, '%')</if>
             <if test="fPlangrossweight != null ">and f_plangrossweight = #{fPlangrossweight}</if>
             <if test="fPlannetweight != null ">and f_plannetweight = #{fPlannetweight}</if>
             <if test="fPlanvolumn != null ">and f_planvolumn = #{fPlanvolumn}</if>
@@ -128,6 +130,7 @@
             bill.f_qty AS fQty,
             bill.f_grossweight AS fGrossweight,
             bill.f_netweight AS fNetweight,
+            bill.f_product_name AS fProductName,
             bill.f_billstatus AS fBillstatus,
             bill.f_items_status AS fItemsStatus,
             bill.f_billno AS fBillno
@@ -193,7 +196,6 @@
             <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
         </where>
         ORDER BY bill.f_bsdate desc
-
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">
@@ -218,8 +220,8 @@
             <if test="fBscorpno != null and fBscorpno != ''">f_bscorpno,</if>
             <if test="fWarehouseid != null">f_warehouseid,</if>
             <if test="fStorekeeper != null">f_storekeeper,</if>
-            <if test="fBsdate != null">f_bsdate,</if>
             <if test="fChargedate != null">f_chargedate,</if>
+            <if test="fBsdate != null">f_bsdate,</if>
             <if test="fPlanqty != null">f_planqty,</if>
             <if test="fPlangrossweight != null">f_plangrossweight,</if>
             <if test="fPlannetweight != null">f_plannetweight,</if>
@@ -251,6 +253,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="fBillingDeadline != null">f_billing_deadline,</if>
+            <if test="fProductName != null">f_product_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -266,8 +269,8 @@
             <if test="fBscorpno != null and fBscorpno != ''">#{fBscorpno},</if>
             <if test="fWarehouseid != null">#{fWarehouseid},</if>
             <if test="fStorekeeper != null">#{fStorekeeper},</if>
-            <if test="fBsdate != null">#{fBsdate},</if>
             <if test="fChargedate != null">#{fChargedate},</if>
+            <if test="fBsdate != null">#{fBsdate},</if>
             <if test="fPlanqty != null">#{fPlanqty},</if>
             <if test="fPlangrossweight != null">#{fPlangrossweight},</if>
             <if test="fPlannetweight != null">#{fPlannetweight},</if>
@@ -299,6 +302,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="fBillingDeadline != null">#{fBillingDeadline},</if>
+            <if test="fProductName != null">#{fProductName},</if>
         </trim>
     </insert>
 
@@ -318,8 +322,8 @@
             <if test="fBscorpno != null and fBscorpno != ''">f_bscorpno = #{fBscorpno},</if>
             <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
             <if test="fStorekeeper != null">f_storekeeper = #{fStorekeeper},</if>
-            <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
             <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
+            <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
             <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
             <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</if>
             <if test="fPlannetweight != null">f_plannetweight = #{fPlannetweight},</if>
@@ -351,6 +355,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="fBillingDeadline != null">f_billing_deadline = #{fBillingDeadline},</if>
+            <if test="fProductName != null">f_product_name = #{fProductName},</if>
         </trim>
         where f_id = #{fId}
     </update>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -10,7 +10,7 @@
         <result property="fLineno" column="f_lineno"/>
         <result property="fCorpid" column="f_corpid"/>
         <result property="fFeeid" column="f_feeid"/>
-        <result property="fFeeUnitid" column="f_feeUnitid"/>
+        <result property="fFeeunitid" column="f_feeUnitid"/>
         <result property="fQty" column="f_qty"/>
         <result property="fUnitprice" column="f_unitprice"/>
         <result property="fAmount" column="f_amount"/>
@@ -20,10 +20,14 @@
         <result property="fDc" column="f_dc"/>
         <result property="fBillstatus" column="f_billstatus"/>
         <result property="fAccamount" column="f_accamount"/>
+        <result property="fStatementNo" column="f_statement_no"/>
         <result property="fStlamount" column="f_stlamount"/>
         <result property="fInvnos" column="f_invnos"/>
+        <result property="fAccamountDate" column="f_accamount_date"/>
         <result property="fInvamount" column="f_invamount"/>
+        <result property="fStlamountNo" column="f_stlamount_no"/>
         <result property="fAskamount" column="f_askamount"/>
+        <result property="fStlamountDate" column="f_stlamount_date"/>
         <result property="fStatus" column="f_status"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
@@ -34,7 +38,7 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsfeesVo">
-        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_billstatus, f_accamount, f_stlamount, f_invnos, f_invamount, f_askamount, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsfees
+        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_billstatus, f_accamount, f_statement_no, f_stlamount, f_invnos, f_accamount_date, f_invamount, f_stlamount_no, f_askamount, f_stlamount_date, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsfees
     </sql>
 
     <select id="selectTWarehousebillsfeesList" parameterType="TWarehousebillsfees"
@@ -45,7 +49,7 @@
             <if test="fLineno != null ">and f_lineno = #{fLineno}</if>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
             <if test="fFeeid != null ">and f_feeid = #{fFeeid}</if>
-            <if test="fFeeUnitid != null ">and f_feeUnitid = #{fFeeUnitid}</if>
+            <if test="fFeeunitid != null ">and f_feeUnitid = #{fFeeunitid}</if>
             <if test="fQty != null ">and f_qty = #{fQty}</if>
             <if test="fUnitprice != null ">and f_unitprice = #{fUnitprice}</if>
             <if test="fAmount != null ">and f_amount = #{fAmount}</if>
@@ -55,10 +59,14 @@
             <if test="fDc != null  and fDc != ''">and f_dc = #{fDc}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fAccamount != null ">and f_accamount = #{fAccamount}</if>
+            <if test="fStatementNo != null  and fStatementNo != ''">and f_statement_no = #{fStatementNo}</if>
             <if test="fStlamount != null ">and f_stlamount = #{fStlamount}</if>
             <if test="fInvnos != null  and fInvnos != ''">and f_invnos = #{fInvnos}</if>
+            <if test="fAccamountDate != null ">and f_accamount_date = #{fAccamountDate}</if>
             <if test="fInvamount != null ">and f_invamount = #{fInvamount}</if>
+            <if test="fStlamountNo != null  and fStlamountNo != ''">and f_stlamount_no = #{fStlamountNo}</if>
             <if test="fAskamount != null ">and f_askamount = #{fAskamount}</if>
+            <if test="fStlamountDate != null ">and f_stlamount_date = #{fStlamountDate}</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
         </where>
     </select>
@@ -68,14 +76,15 @@
         where f_id = #{fId}
     </select>
 
-    <insert id="insertTWarehousebillsfees" parameterType="TWarehousebillsfees" useGeneratedKeys="true" keyProperty="fId">
+    <insert id="insertTWarehousebillsfees" parameterType="TWarehousebillsfees" useGeneratedKeys="true"
+            keyProperty="fId">
         insert into t_warehousebillsfees
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fPid != null">f_pid,</if>
             <if test="fLineno != null">f_lineno,</if>
             <if test="fCorpid != null">f_corpid,</if>
             <if test="fFeeid != null">f_feeid,</if>
-            <if test="fFeeUnitid != null">f_feeUnitid,</if>
+            <if test="fFeeunitid != null">f_feeUnitid,</if>
             <if test="fQty != null">f_qty,</if>
             <if test="fUnitprice != null">f_unitprice,</if>
             <if test="fAmount != null">f_amount,</if>
@@ -85,10 +94,14 @@
             <if test="fDc != null">f_dc,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
             <if test="fAccamount != null">f_accamount,</if>
+            <if test="fStatementNo != null">f_statement_no,</if>
             <if test="fStlamount != null">f_stlamount,</if>
             <if test="fInvnos != null">f_invnos,</if>
+            <if test="fAccamountDate != null">f_accamount_date,</if>
             <if test="fInvamount != null">f_invamount,</if>
+            <if test="fStlamountNo != null">f_stlamount_no,</if>
             <if test="fAskamount != null">f_askamount,</if>
+            <if test="fStlamountDate != null">f_stlamount_date,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -102,7 +115,7 @@
             <if test="fLineno != null">#{fLineno},</if>
             <if test="fCorpid != null">#{fCorpid},</if>
             <if test="fFeeid != null">#{fFeeid},</if>
-            <if test="fFeeUnitid != null">#{fFeeUnitid},</if>
+            <if test="fFeeunitid != null">#{fFeeunitid},</if>
             <if test="fQty != null">#{fQty},</if>
             <if test="fUnitprice != null">#{fUnitprice},</if>
             <if test="fAmount != null">#{fAmount},</if>
@@ -112,10 +125,14 @@
             <if test="fDc != null">#{fDc},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
             <if test="fAccamount != null">#{fAccamount},</if>
+            <if test="fStatementNo != null">#{fStatementNo},</if>
             <if test="fStlamount != null">#{fStlamount},</if>
             <if test="fInvnos != null">#{fInvnos},</if>
+            <if test="fAccamountDate != null">#{fAccamountDate},</if>
             <if test="fInvamount != null">#{fInvamount},</if>
+            <if test="fStlamountNo != null">#{fStlamountNo},</if>
             <if test="fAskamount != null">#{fAskamount},</if>
+            <if test="fStlamountDate != null">#{fStlamountDate},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -133,7 +150,7 @@
             <if test="fLineno != null">f_lineno = #{fLineno},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
             <if test="fFeeid != null">f_feeid = #{fFeeid},</if>
-            <if test="fFeeUnitid != null">f_feeUnitid = #{fFeeUnitid},</if>
+            <if test="fFeeunitid != null">f_feeUnitid = #{fFeeunitid},</if>
             <if test="fQty != null">f_qty = #{fQty},</if>
             <if test="fUnitprice != null">f_unitprice = #{fUnitprice},</if>
             <if test="fAmount != null">f_amount = #{fAmount},</if>
@@ -143,10 +160,14 @@
             <if test="fDc != null">f_dc = #{fDc},</if>
             <if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
             <if test="fAccamount != null">f_accamount = #{fAccamount},</if>
+            <if test="fStatementNo != null">f_statement_no = #{fStatementNo},</if>
             <if test="fStlamount != null">f_stlamount = #{fStlamount},</if>
             <if test="fInvnos != null">f_invnos = #{fInvnos},</if>
+            <if test="fAccamountDate != null">f_accamount_date = #{fAccamountDate},</if>
             <if test="fInvamount != null">f_invamount = #{fInvamount},</if>
+            <if test="fStlamountNo != null">f_stlamount_no = #{fStlamountNo},</if>
             <if test="fAskamount != null">f_askamount = #{fAskamount},</if>
+            <if test="fStlamountDate != null">f_stlamount_date = #{fStlamountDate},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>