修改入库列表页 不显示字段问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -38,7 +38,7 @@ public class TWarehouseInStockController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
-        tWarehouseBills.setFBilltype("SJRK");
+        tWarehouseBills.setfBilltype("SJRK");
         List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -38,7 +38,7 @@ public class TWarehouseOutStockController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
-        tWarehouseBills.setFBilltype("SJCK");
+        tWarehouseBills.setfBilltype("SJCK");
         List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
         return getDataTable(list);
     }

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

@@ -1,10 +1,10 @@
 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 lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -15,7 +15,6 @@ import java.util.Date;
  * @author ruoyi
  * @date 2020-12-11
  */
-@Data
 public class TWarehouseBills extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -28,11 +27,11 @@ public class TWarehouseBills extends BaseEntity {
      * 业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
      * RK CK DB HZ
      */
-    @Excel(name = "业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。RK CK DB HZ ")
+    @Excel(name = "业务编号")
     private String fBillno;
 
     /**
-     * 报关号 取入库的f_customsdeclartion
+     * 报关号
      */
     @Excel(name = "报关号")
     private String fCustomsdeclartion;
@@ -58,13 +57,13 @@ public class TWarehouseBills extends BaseEntity {
     /**
      * 联系人
      */
-    @Excel(name = "业务所属部门")
+    @Excel(name = "联系人")
     private String fContacts;
 
     /**
      * 电话
      */
-    @Excel(name = "业务所属部门")
+    @Excel(name = "电话")
     private String fTel;
 
     /**
@@ -80,12 +79,6 @@ public class TWarehouseBills extends BaseEntity {
     private Long fTocorpid;
 
     /**
-     * 计费方式，f_billingway
-     */
-    @Excel(name = "计费方式")
-    private Long fBillingway;
-
-    /**
      * 结算方式，默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择，存储id，显示name
      */
     @Excel(name = "结算方式，默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择，存储id，显示name")
@@ -95,7 +88,7 @@ public class TWarehouseBills extends BaseEntity {
      * 客户存货编号,格式编号客户编号+YYYY +NNNN，
      * 编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用，每年从001开始
      */
-    @Excel(name = "客户存货编号,格式编号客户编号+YYYY +NNNN，编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用，每年从001开始 ")
+    @Excel(name = "客户存货编号")
     private String fBscorpno;
 
     /**
@@ -107,7 +100,7 @@ public class TWarehouseBills extends BaseEntity {
     /**
      * 仓管人
      */
-    @Excel(name = "仓库人")
+    @Excel(name = "仓管人")
     private String fStorekeeper;
 
     /**
@@ -129,18 +122,18 @@ public class TWarehouseBills extends BaseEntity {
     private BigDecimal fPlangrossweight;
 
     /**
-     * 计划尺码,由明细表自动合计生成
-     */
-    @Excel(name = "计划尺码,由明细表自动合计生成")
-    private BigDecimal fPlanvolumn;
-
-    /**
      * 计划净重,由明细表自动合计生成
      */
     @Excel(name = "计划净重,由明细表自动合计生成")
     private BigDecimal fPlannetweight;
 
     /**
+     * 计划尺码,由明细表自动合计生成
+     */
+    @Excel(name = "计划尺码,由明细表自动合计生成")
+    private BigDecimal fPlanvolumn;
+
+    /**
      * 件数,由明细表自动合计生成
      */
     @Excel(name = "件数,由明细表自动合计生成")
@@ -159,10 +152,10 @@ public class TWarehouseBills extends BaseEntity {
     private BigDecimal fNetweight;
 
     /**
-     * 经营单位(数据字典),对应t_sbu
+     * 尺码，由明细表自动合计生成
      */
-    @Excel(name = "经营单位(客户表)")
-    private Long fSbu;
+    @Excel(name = "尺码，由明细表自动合计生成")
+    private BigDecimal fVolumn;
 
     /**
      * 贸易方式(数据字典),对应t_trademodels
@@ -171,10 +164,16 @@ public class TWarehouseBills extends BaseEntity {
     private Long fTrademodeid;
 
     /**
-     * 尺码，由明细表自动合计生成
+     * 计费方式(数据字典)
      */
-    @Excel(name = "尺码，由明细表自动合计生成")
-    private BigDecimal fVolumn;
+    @Excel(name = "计费方式(数据字典)")
+    private Long fBillingway;
+
+    /**
+     * 经营单位(客户列表)
+     */
+    @Excel(name = "经营单位(客户列表)")
+    private Long fSbu;
 
     /**
      * 计费单位(数据字典),下拉选择毛重或净重
@@ -229,7 +228,7 @@ public class TWarehouseBills extends BaseEntity {
      * 银行名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name
      */
     @Excel(name = "银行名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name")
-    private String fBankcorpid;
+    private Long fBankcorpid;
 
     /**
      * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移）
@@ -246,6 +245,358 @@ public class TWarehouseBills extends BaseEntity {
     /**
      * 删除状态
      */
-    @TableLogic
     private String delFlag;
+
+    public void setfId(Long fId) {
+        this.fId = fId;
+    }
+
+    public Long getfId() {
+        return fId;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfCustomsdeclartion(String fCustomsdeclartion) {
+        this.fCustomsdeclartion = fCustomsdeclartion;
+    }
+
+    public String getfCustomsdeclartion() {
+        return fCustomsdeclartion;
+    }
+
+    public void setfOriginalbillno(String fOriginalbillno) {
+        this.fOriginalbillno = fOriginalbillno;
+    }
+
+    public String getfOriginalbillno() {
+        return fOriginalbillno;
+    }
+
+    public void setfDeptid(Long fDeptid) {
+        this.fDeptid = fDeptid;
+    }
+
+    public Long getfDeptid() {
+        return fDeptid;
+    }
+
+    public void setfBsdeptid(Long fBsdeptid) {
+        this.fBsdeptid = fBsdeptid;
+    }
+
+    public Long getfBsdeptid() {
+        return fBsdeptid;
+    }
+
+    public void setfContacts(String fContacts) {
+        this.fContacts = fContacts;
+    }
+
+    public String getfContacts() {
+        return fContacts;
+    }
+
+    public void setfTel(String fTel) {
+        this.fTel = fTel;
+    }
+
+    public String getfTel() {
+        return fTel;
+    }
+
+    public void setfCorpid(Long fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public Long getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfTocorpid(Long fTocorpid) {
+        this.fTocorpid = fTocorpid;
+    }
+
+    public Long getfTocorpid() {
+        return fTocorpid;
+    }
+
+    public void setfStltypeid(Long fStltypeid) {
+        this.fStltypeid = fStltypeid;
+    }
+
+    public Long getfStltypeid() {
+        return fStltypeid;
+    }
+
+    public void setfBscorpno(String fBscorpno) {
+        this.fBscorpno = fBscorpno;
+    }
+
+    public String getfBscorpno() {
+        return fBscorpno;
+    }
+
+    public void setfWarehouseid(Long fWarehouseid) {
+        this.fWarehouseid = fWarehouseid;
+    }
+
+    public Long getfWarehouseid() {
+        return fWarehouseid;
+    }
+
+    public void setfStorekeeper(String fStorekeeper) {
+        this.fStorekeeper = fStorekeeper;
+    }
+
+    public String getfStorekeeper() {
+        return fStorekeeper;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfPlanqty(Long fPlanqty) {
+        this.fPlanqty = fPlanqty;
+    }
+
+    public Long getfPlanqty() {
+        return fPlanqty;
+    }
+
+    public void setfPlangrossweight(BigDecimal fPlangrossweight) {
+        this.fPlangrossweight = fPlangrossweight;
+    }
+
+    public BigDecimal getfPlangrossweight() {
+        return fPlangrossweight;
+    }
+
+    public void setfPlannetweight(BigDecimal fPlannetweight) {
+        this.fPlannetweight = fPlannetweight;
+    }
+
+    public BigDecimal getfPlannetweight() {
+        return fPlannetweight;
+    }
+
+    public void setfPlanvolumn(BigDecimal fPlanvolumn) {
+        this.fPlanvolumn = fPlanvolumn;
+    }
+
+    public BigDecimal getfPlanvolumn() {
+        return fPlanvolumn;
+    }
+
+    public void setfQty(Long fQty) {
+        this.fQty = fQty;
+    }
+
+    public Long getfQty() {
+        return fQty;
+    }
+
+    public void setfGrossweight(BigDecimal fGrossweight) {
+        this.fGrossweight = fGrossweight;
+    }
+
+    public BigDecimal getfGrossweight() {
+        return fGrossweight;
+    }
+
+    public void setfNetweight(BigDecimal fNetweight) {
+        this.fNetweight = fNetweight;
+    }
+
+    public BigDecimal getfNetweight() {
+        return fNetweight;
+    }
+
+    public void setfVolumn(BigDecimal fVolumn) {
+        this.fVolumn = fVolumn;
+    }
+
+    public BigDecimal getfVolumn() {
+        return fVolumn;
+    }
+
+    public void setfTrademodeid(Long fTrademodeid) {
+        this.fTrademodeid = fTrademodeid;
+    }
+
+    public Long getfTrademodeid() {
+        return fTrademodeid;
+    }
+
+    public void setfBillingway(Long fBillingway) {
+        this.fBillingway = fBillingway;
+    }
+
+    public Long getfBillingway() {
+        return fBillingway;
+    }
+
+    public void setfSbu(Long fSbu) {
+        this.fSbu = fSbu;
+    }
+
+    public Long getfSbu() {
+        return fSbu;
+    }
+
+    public void setfFeetunit(String fFeetunit) {
+        this.fFeetunit = fFeetunit;
+    }
+
+    public String getfFeetunit() {
+        return fFeetunit;
+    }
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    public void setfVslvoy(String fVslvoy) {
+        this.fVslvoy = fVslvoy;
+    }
+
+    public String getfVslvoy() {
+        return fVslvoy;
+    }
+
+    public void setfEta(Date fEta) {
+        this.fEta = fEta;
+    }
+
+    public Date getfEta() {
+        return fEta;
+    }
+
+    public void setfCustomno(String fCustomno) {
+        this.fCustomno = fCustomno;
+    }
+
+    public String getfCustomno() {
+        return fCustomno;
+    }
+
+    public void setfIfweigh(String fIfweigh) {
+        this.fIfweigh = fIfweigh;
+    }
+
+    public String getfIfweigh() {
+        return fIfweigh;
+    }
+
+    public void setfIfpledge(String fIfpledge) {
+        this.fIfpledge = fIfpledge;
+    }
+
+    public String getfIfpledge() {
+        return fIfpledge;
+    }
+
+    public void setfIfdamage(String fIfdamage) {
+        this.fIfdamage = fIfdamage;
+    }
+
+    public String getfIfdamage() {
+        return fIfdamage;
+    }
+
+    public void setfBankcorpid(Long fBankcorpid) {
+        this.fBankcorpid = fBankcorpid;
+    }
+
+    public Long getfBankcorpid() {
+        return fBankcorpid;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("fId", getfId())
+                .append("fBillno", getfBillno())
+                .append("fCustomsdeclartion", getfCustomsdeclartion())
+                .append("fOriginalbillno", getfOriginalbillno())
+                .append("fDeptid", getfDeptid())
+                .append("fBsdeptid", getfBsdeptid())
+                .append("fContacts", getfContacts())
+                .append("fTel", getfTel())
+                .append("fCorpid", getfCorpid())
+                .append("fTocorpid", getfTocorpid())
+                .append("fStltypeid", getfStltypeid())
+                .append("fBscorpno", getfBscorpno())
+                .append("fWarehouseid", getfWarehouseid())
+                .append("fStorekeeper", getfStorekeeper())
+                .append("fBsdate", getfBsdate())
+                .append("fPlanqty", getfPlanqty())
+                .append("fPlangrossweight", getfPlangrossweight())
+                .append("fPlannetweight", getfPlannetweight())
+                .append("fPlanvolumn", getfPlanvolumn())
+                .append("fQty", getfQty())
+                .append("fGrossweight", getfGrossweight())
+                .append("fNetweight", getfNetweight())
+                .append("fVolumn", getfVolumn())
+                .append("fTrademodeid", getfTrademodeid())
+                .append("fBillingway", getfBillingway())
+                .append("fSbu", getfSbu())
+                .append("fFeetunit", getfFeetunit())
+                .append("fMblno", getfMblno())
+                .append("fVslvoy", getfVslvoy())
+                .append("fEta", getfEta())
+                .append("fCustomno", getfCustomno())
+                .append("fIfweigh", getfIfweigh())
+                .append("fIfpledge", getfIfpledge())
+                .append("fIfdamage", getfIfdamage())
+                .append("fBankcorpid", getfBankcorpid())
+                .append("fBilltype", getfBilltype())
+                .append("fBillstatus", getfBillstatus())
+                .append("delFlag", getDelFlag())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -77,15 +77,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
         if (!StringUtils.isNull(tWarehousebills)) {
             // 查询货权方 以及 经营单位
-            map.put("warehouse", tWarehouseMapper.selectTWarehouseById(tWarehousebills.getFWarehouseid()));
+            map.put("warehouse", tWarehouseMapper.selectTWarehouseById(tWarehousebills.getfWarehouseid()));
             // 查询联系人
-            map.put("sysUser", sysUserMapper.selectUserByUserName(tWarehousebills.getFContacts()));
+            map.put("sysUser", sysUserMapper.selectUserByUserName(tWarehousebills.getfContacts()));
             // 查询货权方
-            map.put("fCorps", tCorpsMapper.selectTCorpsById(tWarehousebills.getFCorpid()));
+            map.put("fCorps", tCorpsMapper.selectTCorpsById(tWarehousebills.getfCorpid()));
             // 查询 经营单位
-            map.put("fSbu", tCorpsMapper.selectTCorpsById(tWarehousebills.getFSbu()));
+            map.put("fSbu", tCorpsMapper.selectTCorpsById(tWarehousebills.getfSbu()));
             // 查询所属部门
-            map.put("dept", sysDeptMapper.selectDeptById(tWarehousebills.getFDeptid()));
+            map.put("dept", sysDeptMapper.selectDeptById(tWarehousebills.getfDeptid()));
             map.put("warehousebills", tWarehousebills);
         }
         // 查询仓库明细从表数据
@@ -136,7 +136,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     public List<TWarehouseBills> selectTWarehousebillsList(TWarehouseBills tWarehousebills) {
-        return tWarehouseBillsMapper.selectTWarehousebillsList(tWarehousebills);
+        List<TWarehouseBills> tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsList(tWarehousebills);
+        return tWarehouseBills;
     }
 
     /**
@@ -149,15 +150,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     public TWhgenleg queryTWhgenleg(TWarehouseBills warehouseBills, TWarehousebillsitems warehousebillsitems) {
         TWhgenleg tWhgenleg = new TWhgenleg();
         // 客户
-        tWhgenleg.setfCorpid(warehouseBills.getFCorpid());
+        tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
         // 提单号
-        tWhgenleg.setfMblno(warehouseBills.getFMblno());
+        tWhgenleg.setfMblno(warehouseBills.getfMblno());
         // 库区
         tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid());
         // 货物品名
         tWhgenleg.setfGoodsid(warehousebillsitems.getfGoodsid());
         // 贸易方式
-        tWhgenleg.setfTrademodeid(warehouseBills.getFTrademodeid());
+        tWhgenleg.setfTrademodeid(warehouseBills.getfTrademodeid());
         return tWhgenlegMapper.selectTWhgenleg(tWhgenleg);
     }
 
@@ -171,17 +172,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     public int instalTWhgenleg(TWarehouseBills warehouseBills, TWarehousebillsitems warehousebillsitems, SysUser user) {
         TWhgenleg tWhgenleg = new TWhgenleg();
         // 客户
-        tWhgenleg.setfCorpid(warehouseBills.getFCorpid());
+        tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
         // 提单号
-        tWhgenleg.setfMblno(warehouseBills.getFMblno());
+        tWhgenleg.setfMblno(warehouseBills.getfMblno());
         // 原始单号
-        tWhgenleg.setfOriginalbillno(warehouseBills.getFMblno());
+        tWhgenleg.setfOriginalbillno(warehouseBills.getfMblno());
         // 库区
         tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid());
         // 货物品名
         tWhgenleg.setfGoodsid(warehousebillsitems.getfGoodsid());
         // 贸易方式
-        tWhgenleg.setfTrademodeid(warehouseBills.getFTrademodeid());
+        tWhgenleg.setfTrademodeid(warehouseBills.getfTrademodeid());
         // 入库数
         tWhgenleg.setfQtyd(warehousebillsitems.getfQty());
         // 入库尺码
@@ -224,19 +225,19 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             , String tWarehousebillsitems, String tWhgenleg, LoginUser loginUser, String billsType) {
         Long fPid = null;
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
-        if (StringUtils.isNull(warehouseBills.getFId())) {
+        if (StringUtils.isNull(warehouseBills.getfId())) {
             warehouseBills.setCreateBy(loginUser.getUser().getUserName());
-            warehouseBills.setFBilltype(billsType);
-            warehouseBills.setFBsdeptid(loginUser.getUser().getDeptId());
-            warehouseBills.setFBillstatus("T");
+            warehouseBills.setfBilltype(billsType);
+            warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
+            warehouseBills.setfBillstatus("T");
             // 提交时：  生流水号
-            if(warehouseBills.getFBillstatus().equals("1")){
+            if(warehouseBills.getfBillstatus().equals("1")){
 
             }
             tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
-            fPid=warehouseBills.getFId();
+            fPid=warehouseBills.getfId();
         } else {
-            fPid=warehouseBills.getFId();
+            fPid=warehouseBills.getfId();
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             warehouseBills.setUpdateTime(new Date());
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWhgenlegServiceImpl.java

@@ -40,9 +40,9 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
         TWhgenleg whgenleg = tWhgenlegMapper.selectTWhgenlegById(fAccyear);
         map.put("whgenleg", whgenleg);
         TWarehouseBills warehouseBills = new TWarehouseBills();
-        warehouseBills.setFCorpid(whgenleg.getfCorpid());
-        warehouseBills.setFMblno(whgenleg.getfMblno());
-        warehouseBills.setFTrademodeid(whgenleg.getfTrademodeid());
+        warehouseBills.setfCorpid(whgenleg.getfCorpid());
+        warehouseBills.setfMblno(whgenleg.getfMblno());
+        warehouseBills.setfTrademodeid(whgenleg.getfTrademodeid());
         map.put("warehouseList", tWarehouseBillsMapper.selectTWarehousebillsList(warehouseBills));
         return map;
     }

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

@@ -19,7 +19,6 @@
         <result property="fBscorpno" column="f_bscorpno"/>
         <result property="fWarehouseid" column="f_warehouseid"/>
         <result property="fStorekeeper" column="f_storekeeper"/>
-        <result property="fBillingway" column="f_billingway"/>
         <result property="fBsdate" column="f_bsdate"/>
         <result property="fPlanqty" column="f_planqty"/>
         <result property="fPlangrossweight" column="f_plangrossweight"/>
@@ -30,6 +29,7 @@
         <result property="fNetweight" column="f_netweight"/>
         <result property="fVolumn" column="f_volumn"/>
         <result property="fTrademodeid" column="f_trademodeid"/>
+        <result property="fBillingway" column="f_billingway"/>
         <result property="fSbu" column="f_sbu"/>
         <result property="fFeetunit" column="f_feetunit"/>
         <result property="fMblno" column="f_mblno"/>
@@ -51,7 +51,7 @@
     </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_planqty, f_plangrossweight, f_plannetweight, f_planvolumn, f_billingway, f_qty, f_grossweight, f_netweight, f_volumn, f_trademodeid, f_sbu, f_feetunit, f_mblno, f_vslvoy, f_eta, f_customno, f_ifweigh, f_ifpledge, f_ifdamage, f_bankcorpid, f_billtype, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark 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_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_eta, f_customno, f_ifweigh, f_ifpledge, f_ifdamage, f_bankcorpid, f_billtype, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -82,6 +82,7 @@
             <if test="fNetweight != null ">and f_netweight = #{fNetweight}</if>
             <if test="fVolumn != null ">and f_volumn = #{fVolumn}</if>
             <if test="fTrademodeid != null ">and f_trademodeid = #{fTrademodeid}</if>
+            <if test="fBillingway != null ">and f_billingway = #{fBillingway}</if>
             <if test="fSbu != null ">and f_sbu = #{fSbu}</if>
             <if test="fFeetunit != null  and fFeetunit != ''">and f_feetunit = #{fFeetunit}</if>
             <if test="fMblno != null  and fMblno != ''">and f_mblno = #{fMblno}</if>
@@ -128,10 +129,10 @@
             <if test="fNetweight != null">f_netweight,</if>
             <if test="fVolumn != null">f_volumn,</if>
             <if test="fTrademodeid != null">f_trademodeid,</if>
+            <if test="fBillingway != null">f_billingway,</if>
             <if test="fSbu != null">f_sbu,</if>
             <if test="fFeetunit != null">f_feetunit,</if>
             <if test="fMblno != null">f_mblno,</if>
-            <if test="fBillingway != null">f_billingway,</if>
             <if test="fVslvoy != null">f_vslvoy,</if>
             <if test="fEta != null">f_eta,</if>
             <if test="fCustomno != null">f_customno,</if>
@@ -172,10 +173,10 @@
             <if test="fNetweight != null">#{fNetweight},</if>
             <if test="fVolumn != null">#{fVolumn},</if>
             <if test="fTrademodeid != null">#{fTrademodeid},</if>
+            <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fSbu != null">#{fSbu},</if>
             <if test="fFeetunit != null">#{fFeetunit},</if>
             <if test="fMblno != null">#{fMblno},</if>
-            <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fVslvoy != null">#{fVslvoy},</if>
             <if test="fEta != null">#{fEta},</if>
             <if test="fCustomno != null">#{fCustomno},</if>