[CODE]: 库存明细 添加字段

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

@@ -1,417 +1,508 @@
 package com.ruoyi.warehouseBusiness.domain;
 
+import java.math.BigDecimal;
+import java.util.Date;
 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;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 仓库明细从表对象 t_warehousebillsitems
  *
  * @author ruoyi
- * @date 2020-12-16
+ * @date 2021-01-15
  */
-public class TWarehousebillsitems extends BaseEntity {
+public class TWarehousebillsitems extends BaseEntity
+{
     private static final long serialVersionUID = 1L;
 
-    /**
-     * $column.columnComment
-     */
+    /** $column.columnComment */
     private Long fId;
 
-    /**
-     * PID,对应主表id
-     */
+    /** PID,对应主表id */
     @Excel(name = "PID,对应主表id")
     private Long fPid;
 
-    /**
-     * 行号，针对pid顺序排列，1，2，3，4，
-     */
+    /** 行号，针对pid顺序排列，1，2，3，4， */
     @Excel(name = "行号，针对pid顺序排列，1，2，3，4，")
     private Long fLineno;
 
-    /**
-     * 货物品名，存储id 显示名称	t_goods 中的no或 name，模糊查找选择后，存储f_id，显示name
-     */
+    /** 货物品名，存储id 显示名称	t_goods 中的no或 name，模糊查找选择后，存储f_id，显示name */
     @Excel(name = "货物品名，存储id 显示名称	t_goods 中的no或 name，模糊查找选择后，存储f_id，显示name")
     private Long fGoodsid;
 
-    /**
-     * 提单号
-     */
+    /** 提单号 */
     @Excel(name = "提单号")
     private String fMblno;
 
-    /**
-     * 计费方式(数据字典)
-     */
-    @Excel(name = "计费方式(数据字典)")
-    private Long fBillingway;
-
-    /**
-     * 入库库区，存储库区ID,显示仓库 库位 库区，t_warehouse_area中的f_id
-     */
+    /** 入库库区，存储库区ID,显示仓库 库位 库区，t_warehouse_area中的f_id */
     @Excel(name = "入库库区，存储库区ID,显示仓库 库位 库区，t_warehouse_area中的f_id")
     private Long fWarehouselocid;
 
-    /**
-     * 入（出）库日期
-     */
+    /** 入（出）库日期 */
     @Excel(name = "入", readConverterExp = "出=")
     private Date fBsdate;
 
-    /**
-     * 原始入库业务编号
-     */
+    /** 原始入库业务编号 */
     @Excel(name = "原始入库业务编号")
     private String fOriginalbillno;
 
-    /**
-     * 箱号
-     */
+    /** 箱号 */
     @Excel(name = "箱号")
     private String fBoxno;
 
-    /**
-     * 箱量
-     */
+    /** 箱量 */
     @Excel(name = "箱量")
     private Long fCntqty;
 
-    /**
-     * 货值
-     */
+    /** 货值 */
     @Excel(name = "货值")
     private BigDecimal fGoodsval;
 
-    /**
-     * 箱型,20GP 4OGP
-     */
+    /** 箱型,20GP 4OGP */
     @Excel(name = "箱型,20GP 4OGP")
     private String fCntrtype;
 
-    /**
-     * 仓储计费日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "仓储计费日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fChargedate;
+    /** 计费方式(数据字典) */
+    @Excel(name = "计费方式(数据字典)")
+    private Long fBillingway;
 
-    /**
-     * 计划件数
-     */
+    /** 计划件数 */
     @Excel(name = "计划件数")
     private Long fPlanqty;
 
-    /**
-     * 计划尺码
-     */
+    /** 计划尺码 */
     @Excel(name = "计划尺码")
     private BigDecimal fPlanvolumn;
 
-    /**
-     * 包装规格
-     */
+    /** 包装规格 */
     @Excel(name = "包装规格")
     private Long fPackagespecs;
 
-    /**
-     * 计划毛重
-     */
+    /** 仓储计费日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储计费日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fChargedate;
+
+    /** 计划毛重 */
     @Excel(name = "计划毛重")
     private BigDecimal fPlangrossweight;
 
-    /**
-     * 计划净重
-     */
+    /** 计划净重 */
     @Excel(name = "计划净重")
     private BigDecimal fPlannetweight;
 
-    /**
-     * 件数
-     */
+    /** 件数 */
     @Excel(name = "件数")
     private Long fQty;
 
-    /**
-     * 尺码
-     */
+    /** 尺码 */
     @Excel(name = "尺码")
     private BigDecimal fVolumn;
 
-    /**
-     * 毛重
-     */
+    /** 毛重 */
     @Excel(name = "毛重")
     private BigDecimal fGrossweight;
 
-    /**
-     * 净重
-     */
+    /** 净重 */
     @Excel(name = "净重")
     private BigDecimal fNetweight;
 
-    /**
-     * 箱号
-     */
+    /** 箱号 */
     @Excel(name = "箱号")
     private String fCntrno;
 
-    /**
-     * 车号
-     */
+    /** 车号 */
     @Excel(name = "车号")
     private String fTruckno;
 
-    /**
-     * 状态,N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
-     */
+    /** 状态,N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。 */
     @Excel(name = "状态,N 入", readConverterExp = "出=")
     private String fBillstatus;
 
-    /**
-     * 删除状态
-     */
+    /** 删除状态 */
     private String delFlag;
 
-    /**
-     * 唛头
-     */
+    /** 唛头 */
     @Excel(name = "唛头")
     private String fMarks;
 
-    public void setfId(Long fId) {
+    /** 库存天数(出库日期-仓储费计费日期) */
+    @Excel(name = "库存天数(出库日期-仓储费计费日期)")
+    private Long fInventoryDays;
+
+    /** 仓储费截至日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fStorageFeeDeadline;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private BigDecimal fAmt;
+
+    /** 计费天数 */
+    @Excel(name = "计费天数")
+    private Long fBillingDays;
+
+    /** 司机名 */
+    @Excel(name = "司机名")
+    private String fDriverName;
+
+    /** 司机电话 */
+    @Excel(name = "司机电话")
+    private String fDriverTel;
+
+    /** 司机身份证 */
+    @Excel(name = "司机身份证")
+    private String fDriverIdCar;
+
+    /** 流水号 */
+    @Excel(name = "流水号")
+    private String fSerialNumber;
+
+    /** 是否已放行(T为放行、F未放行) */
+    @Excel(name = "是否已放行(T为放行、F未放行)")
+    private String fIsPass;
+
+    public void setfId(Long fId)
+    {
         this.fId = fId;
     }
 
-    public Long getfId() {
+    public Long getfId()
+    {
         return fId;
     }
-
-    public void setfPid(Long fPid) {
+    public void setfPid(Long fPid)
+    {
         this.fPid = fPid;
     }
 
-    public Long getfPid() {
+    public Long getfPid()
+    {
         return fPid;
     }
-
-    public void setfLineno(Long fLineno) {
+    public void setfLineno(Long fLineno)
+    {
         this.fLineno = fLineno;
     }
 
-    public Long getfLineno() {
+    public Long getfLineno()
+    {
         return fLineno;
     }
-
-    public void setfGoodsid(Long fGoodsid) {
+    public void setfGoodsid(Long fGoodsid)
+    {
         this.fGoodsid = fGoodsid;
     }
 
-    public Long getfGoodsid() {
+    public Long getfGoodsid()
+    {
         return fGoodsid;
     }
-
-    public void setfMblno(String fMblno) {
+    public void setfMblno(String fMblno)
+    {
         this.fMblno = fMblno;
     }
 
-    public String getfMblno() {
+    public String getfMblno()
+    {
         return fMblno;
     }
-
-    public void setfWarehouselocid(Long fWarehouselocid) {
+    public void setfWarehouselocid(Long fWarehouselocid)
+    {
         this.fWarehouselocid = fWarehouselocid;
     }
 
-    public Long getfWarehouselocid() {
+    public Long getfWarehouselocid()
+    {
         return fWarehouselocid;
     }
-
-    public void setfChargedate(Date fChargedate) {
-        this.fChargedate = fChargedate;
-    }
-
-    public Date getfChargedate() {
-        return fChargedate;
-    }
-
-    public void setfBsdate(Date fBsdate) {
+    public void setfBsdate(Date fBsdate)
+    {
         this.fBsdate = fBsdate;
     }
 
-    public Date getfBsdate() {
+    public Date getfBsdate()
+    {
         return fBsdate;
     }
-
-    public void setfOriginalbillno(String fOriginalbillno) {
+    public void setfOriginalbillno(String fOriginalbillno)
+    {
         this.fOriginalbillno = fOriginalbillno;
     }
 
-    public String getfOriginalbillno() {
+    public String getfOriginalbillno()
+    {
         return fOriginalbillno;
     }
-
-    public void setfBoxno(String fBoxno) {
+    public void setfBoxno(String fBoxno)
+    {
         this.fBoxno = fBoxno;
     }
 
-    public String getfBoxno() {
+    public String getfBoxno()
+    {
         return fBoxno;
     }
-
-    public void setfCntqty(Long fCntqty) {
+    public void setfCntqty(Long fCntqty)
+    {
         this.fCntqty = fCntqty;
     }
 
-    public Long getfCntqty() {
+    public Long getfCntqty()
+    {
         return fCntqty;
     }
-
-    public void setfBillingway(Long fBillingway) {
-        this.fBillingway = fBillingway;
-    }
-
-    public Long getfBillingway() {
-        return fBillingway;
-    }
-
-    public void setfGoodsval(BigDecimal fGoodsval) {
+    public void setfGoodsval(BigDecimal fGoodsval)
+    {
         this.fGoodsval = fGoodsval;
     }
 
-    public BigDecimal getfGoodsval() {
+    public BigDecimal getfGoodsval()
+    {
         return fGoodsval;
     }
-
-    public void setfCntrtype(String fCntrtype) {
+    public void setfCntrtype(String fCntrtype)
+    {
         this.fCntrtype = fCntrtype;
     }
 
-    public String getfCntrtype() {
+    public String getfCntrtype()
+    {
         return fCntrtype;
     }
+    public void setfBillingway(Long fBillingway)
+    {
+        this.fBillingway = fBillingway;
+    }
 
-    public void setfPlanqty(Long fPlanqty) {
+    public Long getfBillingway()
+    {
+        return fBillingway;
+    }
+    public void setfPlanqty(Long fPlanqty)
+    {
         this.fPlanqty = fPlanqty;
     }
 
-    public Long getfPlanqty() {
+    public Long getfPlanqty()
+    {
         return fPlanqty;
     }
-
-    public void setfPlanvolumn(BigDecimal fPlanvolumn) {
+    public void setfPlanvolumn(BigDecimal fPlanvolumn)
+    {
         this.fPlanvolumn = fPlanvolumn;
     }
 
-    public BigDecimal getfPlanvolumn() {
+    public BigDecimal getfPlanvolumn()
+    {
         return fPlanvolumn;
     }
-
-    public void setfPackagespecs(Long fPackagespecs) {
+    public void setfPackagespecs(Long fPackagespecs)
+    {
         this.fPackagespecs = fPackagespecs;
     }
 
-    public Long getfPackagespecs() {
+    public Long getfPackagespecs()
+    {
         return fPackagespecs;
     }
+    public void setfChargedate(Date fChargedate)
+    {
+        this.fChargedate = fChargedate;
+    }
 
-    public void setfPlangrossweight(BigDecimal fPlangrossweight) {
+    public Date getfChargedate()
+    {
+        return fChargedate;
+    }
+    public void setfPlangrossweight(BigDecimal fPlangrossweight)
+    {
         this.fPlangrossweight = fPlangrossweight;
     }
 
-    public BigDecimal getfPlangrossweight() {
+    public BigDecimal getfPlangrossweight()
+    {
         return fPlangrossweight;
     }
-
-    public void setfPlannetweight(BigDecimal fPlannetweight) {
+    public void setfPlannetweight(BigDecimal fPlannetweight)
+    {
         this.fPlannetweight = fPlannetweight;
     }
 
-    public BigDecimal getfPlannetweight() {
+    public BigDecimal getfPlannetweight()
+    {
         return fPlannetweight;
     }
-
-    public void setfQty(Long fQty) {
+    public void setfQty(Long fQty)
+    {
         this.fQty = fQty;
     }
 
-    public Long getfQty() {
+    public Long getfQty()
+    {
         return fQty;
     }
-
-    public void setfVolumn(BigDecimal fVolumn) {
+    public void setfVolumn(BigDecimal fVolumn)
+    {
         this.fVolumn = fVolumn;
     }
 
-    public BigDecimal getfVolumn() {
+    public BigDecimal getfVolumn()
+    {
         return fVolumn;
     }
-
-    public void setfGrossweight(BigDecimal fGrossweight) {
+    public void setfGrossweight(BigDecimal fGrossweight)
+    {
         this.fGrossweight = fGrossweight;
     }
 
-    public BigDecimal getfGrossweight() {
+    public BigDecimal getfGrossweight()
+    {
         return fGrossweight;
     }
-
-    public void setfNetweight(BigDecimal fNetweight) {
+    public void setfNetweight(BigDecimal fNetweight)
+    {
         this.fNetweight = fNetweight;
     }
 
-    public BigDecimal getfNetweight() {
+    public BigDecimal getfNetweight()
+    {
         return fNetweight;
     }
-
-    public void setfCntrno(String fCntrno) {
+    public void setfCntrno(String fCntrno)
+    {
         this.fCntrno = fCntrno;
     }
 
-    public String getfCntrno() {
+    public String getfCntrno()
+    {
         return fCntrno;
     }
-
-    public void setfTruckno(String fTruckno) {
+    public void setfTruckno(String fTruckno)
+    {
         this.fTruckno = fTruckno;
     }
 
-    public String getfTruckno() {
+    public String getfTruckno()
+    {
         return fTruckno;
     }
-
-    public void setfBillstatus(String fBillstatus) {
+    public void setfBillstatus(String fBillstatus)
+    {
         this.fBillstatus = fBillstatus;
     }
 
-    public String getfBillstatus() {
+    public String getfBillstatus()
+    {
         return fBillstatus;
     }
-
-    public void setDelFlag(String delFlag) {
+    public void setDelFlag(String delFlag)
+    {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() {
+    public String getDelFlag()
+    {
         return delFlag;
     }
-
-    public void setfMarks(String fMarks) {
+    public void setfMarks(String fMarks)
+    {
         this.fMarks = fMarks;
     }
 
-    public String getfMarks() {
+    public String getfMarks()
+    {
         return fMarks;
     }
+    public void setfInventoryDays(Long fInventoryDays)
+    {
+        this.fInventoryDays = fInventoryDays;
+    }
+
+    public Long getfInventoryDays()
+    {
+        return fInventoryDays;
+    }
+    public void setfStorageFeeDeadline(Date fStorageFeeDeadline)
+    {
+        this.fStorageFeeDeadline = fStorageFeeDeadline;
+    }
+
+    public Date getfStorageFeeDeadline()
+    {
+        return fStorageFeeDeadline;
+    }
+    public void setfAmt(BigDecimal fAmt)
+    {
+        this.fAmt = fAmt;
+    }
+
+    public BigDecimal getfAmt()
+    {
+        return fAmt;
+    }
+    public void setfBillingDays(Long fBillingDays)
+    {
+        this.fBillingDays = fBillingDays;
+    }
+
+    public Long getfBillingDays()
+    {
+        return fBillingDays;
+    }
+    public void setfDriverName(String fDriverName)
+    {
+        this.fDriverName = fDriverName;
+    }
+
+    public String getfDriverName()
+    {
+        return fDriverName;
+    }
+    public void setfDriverTel(String fDriverTel)
+    {
+        this.fDriverTel = fDriverTel;
+    }
+
+    public String getfDriverTel()
+    {
+        return fDriverTel;
+    }
+    public void setfDriverIdCar(String fDriverIdCar)
+    {
+        this.fDriverIdCar = fDriverIdCar;
+    }
+
+    public String getfDriverIdCar()
+    {
+        return fDriverIdCar;
+    }
+    public void setfSerialNumber(String fSerialNumber)
+    {
+        this.fSerialNumber = fSerialNumber;
+    }
+
+    public String getfSerialNumber()
+    {
+        return fSerialNumber;
+    }
+    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)
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("fId", getfId())
                 .append("fPid", getfPid())
                 .append("fLineno", getfLineno())
@@ -421,14 +512,14 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fBsdate", getfBsdate())
                 .append("fOriginalbillno", getfOriginalbillno())
                 .append("fBoxno", getfBoxno())
-                .append("fChargedate", getfChargedate())
                 .append("fCntqty", getfCntqty())
                 .append("fGoodsval", getfGoodsval())
                 .append("fCntrtype", getfCntrtype())
-                .append("fPlanqty", getfPlanqty())
                 .append("fBillingway", getfBillingway())
+                .append("fPlanqty", getfPlanqty())
                 .append("fPlanvolumn", getfPlanvolumn())
                 .append("fPackagespecs", getfPackagespecs())
+                .append("fChargedate", getfChargedate())
                 .append("fPlangrossweight", getfPlangrossweight())
                 .append("fPlannetweight", getfPlannetweight())
                 .append("fQty", getfQty())
@@ -445,6 +536,15 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("fMarks", getfMarks())
+                .append("fInventoryDays", getfInventoryDays())
+                .append("fStorageFeeDeadline", getfStorageFeeDeadline())
+                .append("fAmt", getfAmt())
+                .append("fBillingDays", getfBillingDays())
+                .append("fDriverName", getfDriverName())
+                .append("fDriverTel", getfDriverTel())
+                .append("fDriverIdCar", getfDriverIdCar())
+                .append("fSerialNumber", getfSerialNumber())
+                .append("fIsPass", getfIsPass())
                 .toString();
     }
-}
+}

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

@@ -38,10 +38,19 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="fMarks" column="f_marks"/>
+        <result property="fInventoryDays"    column="f_inventory_days"    />
+        <result property="fStorageFeeDeadline"    column="f_storage_fee_deadline"    />
+        <result property="fAmt"    column="f_amt"    />
+        <result property="fBillingDays"    column="f_billing_days"    />
+        <result property="fDriverName"    column="f_driver_name"    />
+        <result property="fDriverTel"    column="f_driver_tel"    />
+        <result property="fDriverIdCar"    column="f_driver_id_car"    />
+        <result property="fSerialNumber"    column="f_serial_number"    />
+        <result property="fIsPass"    column="f_is_pass"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_lineno, f_goodsid, f_mblno, f_warehouselocid, f_bsdate, f_originalbillno, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_chargedate, f_billingway, f_planqty, f_planvolumn, f_packagespecs, f_plangrossweight, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks from t_warehousebillsitems
+        select f_id, f_pid, f_lineno, f_goodsid, f_mblno, f_warehouselocid, f_bsdate, f_originalbillno, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_chargedate, f_billingway, f_planqty, f_planvolumn, f_packagespecs, f_plangrossweight, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks,f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass from t_warehousebillsitems
     </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
@@ -73,6 +82,15 @@
             <if test="fTruckno != null  and fTruckno != ''">and f_truckno = #{fTruckno}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
+            <if test="fInventoryDays != null "> and f_inventory_days = #{fInventoryDays}</if>
+            <if test="fStorageFeeDeadline != null "> and f_storage_fee_deadline = #{fStorageFeeDeadline}</if>
+            <if test="fAmt != null "> and f_amt = #{fAmt}</if>
+            <if test="fBillingDays != null "> and f_billing_days = #{fBillingDays}</if>
+            <if test="fDriverName != null  and fDriverName != ''"> and f_driver_name like concat('%', #{fDriverName}, '%')</if>
+            <if test="fDriverTel != null  and fDriverTel != ''"> and f_driver_tel = #{fDriverTel}</if>
+            <if test="fDriverIdCar != null  and fDriverIdCar != ''"> and f_driver_id_car = #{fDriverIdCar}</if>
+            <if test="fSerialNumber != null  and fSerialNumber != ''"> and f_serial_number = #{fSerialNumber}</if>
+            <if test="fIsPass != null  and fIsPass != ''"> and f_is_pass = #{fIsPass}</if>
         </where>
     </select>
 
@@ -158,6 +176,15 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="fMarks != null">f_marks,</if>
+            <if test="fInventoryDays != null">f_inventory_days,</if>
+            <if test="fStorageFeeDeadline != null">f_storage_fee_deadline,</if>
+            <if test="fAmt != null">f_amt,</if>
+            <if test="fBillingDays != null">f_billing_days,</if>
+            <if test="fDriverName != null">f_driver_name,</if>
+            <if test="fDriverTel != null">f_driver_tel,</if>
+            <if test="fDriverIdCar != null">f_driver_id_car,</if>
+            <if test="fSerialNumber != null">f_serial_number,</if>
+            <if test="fIsPass != null">f_is_pass,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
@@ -192,6 +219,15 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="fMarks != null">#{fMarks},</if>
+            <if test="fInventoryDays != null">#{fInventoryDays},</if>
+            <if test="fStorageFeeDeadline != null">#{fStorageFeeDeadline},</if>
+            <if test="fAmt != null">#{fAmt},</if>
+            <if test="fBillingDays != null">#{fBillingDays},</if>
+            <if test="fDriverName != null">#{fDriverName},</if>
+            <if test="fDriverTel != null">#{fDriverTel},</if>
+            <if test="fDriverIdCar != null">#{fDriverIdCar},</if>
+            <if test="fSerialNumber != null">#{fSerialNumber},</if>
+            <if test="fIsPass != null">#{fIsPass},</if>
         </trim>
     </insert>
 
@@ -230,6 +266,15 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="fMarks != null">f_marks = #{fMarks},</if>
+            <if test="fInventoryDays != null">f_inventory_days = #{fInventoryDays},</if>
+            <if test="fStorageFeeDeadline != null">f_storage_fee_deadline = #{fStorageFeeDeadline},</if>
+            <if test="fAmt != null">f_amt = #{fAmt},</if>
+            <if test="fBillingDays != null">f_billing_days = #{fBillingDays},</if>
+            <if test="fDriverName != null">f_driver_name = #{fDriverName},</if>
+            <if test="fDriverTel != null">f_driver_tel = #{fDriverTel},</if>
+            <if test="fDriverIdCar != null">f_driver_id_car = #{fDriverIdCar},</if>
+            <if test="fSerialNumber != null">f_serial_number = #{fSerialNumber},</if>
+            <if test="fIsPass != null">f_is_pass = #{fIsPass},</if>
         </trim>
         where f_id = #{fId}
     </update>