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

ruoyi-admin/src/main/resources/application.yml

@@ -12,7 +12,7 @@ ruoyi:
     # 本地文件上传路径
   profile: D:/ruoyi/uploadPath
   # 服务器文件路径
-#  profile: /usr/local/ruoyi/uploadPath
+#  profile: /home/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

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

@@ -193,6 +193,12 @@ public class TWhgenleg extends BaseEntity {
     private String delFlag;
 
     /**
+     * 业务类型(存汉字的，用来选择 产地 规格 品牌)
+     */
+    @Excel(name = "业务类型(存汉字的，用来选择 产地 规格 品牌)")
+    private Long fBusinessType;
+
+    /**
      * 唛头
      */
     @Excel(name = "唛头")
@@ -595,16 +601,19 @@ public class TWhgenleg extends BaseEntity {
     }
 
     public void setfMarks(String fMarks) {
-
         this.fMarks = fMarks;
-
     }
 
-
     public String getfMarks() {
-
         return fMarks;
+    }
+
+    public void setfBusinessType(Long fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
 
+    public Long getfBusinessType() {
+        return fBusinessType;
     }
 
     public void setfOriginalbilldate(Date fOriginalbilldate) {
@@ -657,6 +666,7 @@ public class TWhgenleg extends BaseEntity {
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
                 .append("fMarks", getfMarks())
+                .append("fBusinessType", getfBusinessType())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())

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

@@ -277,6 +277,25 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "仓储费计费截至日期")
     private Date fBillingDeadline;
 
+    /** 车号 */
+    @Excel(name = "车号")
+    private String fTruckno;
+
+    /** 司机名 */
+    @Excel(name = "司机名")
+    private String fDriverName;
+
+    /** 司机电话 */
+    @Excel(name = "司机电话")
+    private String fDriverTel;
+
+    /** 司机身份证 */
+    @Excel(name = "司机身份证")
+    private String fDriverIdCar;
+
+    /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
+    @Excel(name = "业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别)")
+    private String fBusinessType;
 
     /**
      * 查询时间区间
@@ -657,9 +676,49 @@ public class TWarehouseBills extends BaseEntity {
         this.fBillingDeadline = fBillingDeadline;
     }
 
+    public String getfTruckno() {
+        return fTruckno;
+    }
+
+    public void setfTruckno(String fTruckno) {
+        this.fTruckno = fTruckno;
+    }
+
+    public String getfDriverName() {
+        return fDriverName;
+    }
+
+    public void setfDriverName(String fDriverName) {
+        this.fDriverName = fDriverName;
+    }
+
+    public String getfDriverTel() {
+        return fDriverTel;
+    }
+
+    public void setfDriverTel(String fDriverTel) {
+        this.fDriverTel = fDriverTel;
+    }
+
+    public String getfDriverIdCar() {
+        return fDriverIdCar;
+    }
+
+    public void setfDriverIdCar(String fDriverIdCar) {
+        this.fDriverIdCar = fDriverIdCar;
+    }
+
+    public String getfBusinessType() {
+        return fBusinessType;
+    }
+
+    public void setfBusinessType(String fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("fId", getfId())
                 .append("fBillno", getfBillno())
                 .append("fCustomsdeclartion", getfCustomsdeclartion())
@@ -677,13 +736,10 @@ 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())
                 .append("fQty", getfQty())
-                .append("fItemsStatus", getfItemsStatus())
-                .append("fReviewDate", getfReviewDate())
                 .append("fGrossweight", getfGrossweight())
                 .append("fNetweight", getfNetweight())
                 .append("fVolumn", getfVolumn())
@@ -691,7 +747,6 @@ 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())
@@ -706,9 +761,18 @@ public class TWarehouseBills extends BaseEntity {
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
+                .append("fItemsStatus", getfItemsStatus())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
+                .append("fBillingDeadline", getfBillingDeadline())
+                .append("fProductName", getfProductName())
+                .append("fReviewDate", getfReviewDate())
+                .append("fTruckno", getfTruckno())
+                .append("fDriverName", getfDriverName())
+                .append("fDriverTel", getfDriverTel())
+                .append("fDriverIdCar", getfDriverIdCar())
+                .append("fBusinessType", getfBusinessType())
                 .toString();
     }
 }

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

@@ -278,6 +278,10 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "仓储费计费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fBillingDeadline;
 
+    /** 业务类型(存汉字的，用来选择 产地 规格 品牌) */
+    @Excel(name = "业务类型(存汉字的，用来选择 产地 规格 品牌)")
+    private Long fBusinessType;
+
     public void setfId(Long fId) {
         this.fId = fId;
     }
@@ -630,6 +634,14 @@ public class TWarehousebillsitems extends BaseEntity {
         return fBillingDeadline;
     }
 
+    public void setfBusinessType(Long fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
+    public Long getfBusinessType() {
+        return fBusinessType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -681,6 +693,7 @@ public class TWarehousebillsitems extends BaseEntity {
                 .append("fIsPass", getfIsPass())
                 .append("fBilltype", getfBilltype())
                 .append("fBillingQty", getfBillingQty())
+                .append("fBusinessType", getfBusinessType())
                 .append("fBillingDeadline", getfBillingDeadline())
                 .toString();
     }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -40,11 +40,12 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="fBusinessType" column="f_business_type"/>
         <result property="fOriginalbilldate" column="f_originalbilldate"/>
     </resultMap>
 
     <sql id="selectTWhgenlegVo">
-        select f_id, f_accyear, f_accmonth, f_corpid, f_mblno, f_originalbillno, f_warehouse_locationid, f_goodsid, f_chargedate, f_trademodeid, f_preqty, f_warehouseid, f_pregrossweight, f_prenetweight, f_qtyD, f_volumnD, f_billingway, f_grossweightD, f_netweightD, f_volumnC, f_qtyC, f_grossweightC, f_qtyblc, f_grossweightblc, f_netweightC, f_netweightblc, f_cntrno, f_status, del_flag, create_by, f_marks, create_time, update_by, update_time, remark, f_originalbilldate from t_whgenleg
+        select f_id, f_accyear, f_accmonth, f_corpid, f_mblno, f_originalbillno, f_warehouse_locationid, f_goodsid, f_trademodeid, f_preqty, f_pregrossweight, f_warehouseid, f_prenetweight, f_chargedate, f_volumnD, f_qtyD, f_billingway, f_grossweightD, f_netweightD, f_volumnC, f_qtyC, f_grossweightC, f_qtyblc, f_grossweightblc, f_netweightC, f_netweightblc, f_cntrno, f_status, del_flag, f_marks, create_by, create_time, update_by, f_volumnblc, update_time, remark, f_business_type, f_originalbilldate from t_whgenleg
     </sql>
 
     <select id="selectTWhgenlegList" parameterType="TWhgenleg" resultMap="TWhgenlegResult">
@@ -62,6 +63,7 @@
             <if test="fGrossweightd != null ">and f_grossweightD = #{fGrossweightd}</if>
             <if test="fNetweightd != null ">and f_netweightD = #{fNetweightd}</if>
             <if test="fVolumnc != null ">and f_volumnC = #{fVolumnc}</if>
+            <if test="fBusinessType != null "> and f_business_type = #{fBusinessType}</if>
             <if test="fQtyc != null ">and f_qtyC = #{fQtyc}</if>
             <if test="fGrossweightc != null ">and f_grossweightC = #{fGrossweightc}</if>
             <if test="fQtyblc != null ">and f_qtyblc = #{fQtyblc}</if>
@@ -95,6 +97,7 @@
             leg.f_volumnC AS fVolumnC,
             leg.f_volumnblc AS fVolumnblc,
             leg.f_qtyC AS fQtyC,
+            leg.f_business_type AS fBusinessType,
             leg.f_grossweightC AS fGrossweightC,
             leg.f_netweightC AS fNetweightC,
             leg.f_qtyblc AS fQtyblc,
@@ -174,14 +177,14 @@
             <if test="fOriginalbillno != null">f_originalbillno,</if>
             <if test="fWarehouseLocationid != null">f_warehouse_locationid,</if>
             <if test="fGoodsid != null">f_goodsid,</if>
-            <if test="fChargedate != null">f_chargedate,</if>
             <if test="fTrademodeid != null">f_trademodeid,</if>
             <if test="fPreqty != null">f_preqty,</if>
-            <if test="fWarehouseid != null">f_warehouseid,</if>
             <if test="fPregrossweight != null">f_pregrossweight,</if>
+            <if test="fWarehouseid != null">f_warehouseid,</if>
             <if test="fPrenetweight != null">f_prenetweight,</if>
-            <if test="fQtyd != null">f_qtyD,</if>
+            <if test="fChargedate != null">f_chargedate,</if>
             <if test="fVolumnd != null">f_volumnD,</if>
+            <if test="fQtyd != null">f_qtyD,</if>
             <if test="fBillingway != null">f_billingway,</if>
             <if test="fGrossweightd != null">f_grossweightD,</if>
             <if test="fNetweightd != null">f_netweightD,</if>
@@ -195,12 +198,14 @@
             <if test="fCntrno != null">f_cntrno,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
             <if test="fMarks != null and fMarks != ''">f_marks,</if>
+            <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="fVolumnblc != null">f_volumnblc,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="fBusinessType != null">f_business_type,</if>
             <if test="fOriginalbilldate != null">f_originalbilldate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -211,14 +216,14 @@
             <if test="fOriginalbillno != null">#{fOriginalbillno},</if>
             <if test="fWarehouseLocationid != null">#{fWarehouseLocationid},</if>
             <if test="fGoodsid != null">#{fGoodsid},</if>
-            <if test="fChargedate != null">#{fChargedate},</if>
             <if test="fTrademodeid != null">#{fTrademodeid},</if>
             <if test="fPreqty != null">#{fPreqty},</if>
-            <if test="fWarehouseid != null">#{fWarehouseid},</if>
             <if test="fPregrossweight != null">#{fPregrossweight},</if>
+            <if test="fWarehouseid != null">#{fWarehouseid},</if>
             <if test="fPrenetweight != null">#{fPrenetweight},</if>
-            <if test="fQtyd != null">#{fQtyd},</if>
+            <if test="fChargedate != null">#{fChargedate},</if>
             <if test="fVolumnd != null">#{fVolumnd},</if>
+            <if test="fQtyd != null">#{fQtyd},</if>
             <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fGrossweightd != null">#{fGrossweightd},</if>
             <if test="fNetweightd != null">#{fNetweightd},</if>
@@ -232,12 +237,14 @@
             <if test="fCntrno != null">#{fCntrno},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
             <if test="fMarks != null and fMarks != ''">#{fMarks},</if>
+            <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="fVolumnblc != null">#{fVolumnblc},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="fBusinessType != null">#{fBusinessType},</if>
             <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
         </trim>
     </insert>
@@ -252,14 +259,14 @@
             <if test="fOriginalbillno != null">f_originalbillno = #{fOriginalbillno},</if>
             <if test="fWarehouseLocationid != null">f_warehouse_locationid = #{fWarehouseLocationid},</if>
             <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
-            <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
             <if test="fTrademodeid != null">f_trademodeid = #{fTrademodeid},</if>
             <if test="fPreqty != null">f_preqty = #{fPreqty},</if>
-            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
             <if test="fPregrossweight != null">f_pregrossweight = #{fPregrossweight},</if>
+            <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
             <if test="fPrenetweight != null">f_prenetweight = #{fPrenetweight},</if>
-            <if test="fQtyd != null">f_qtyD = #{fQtyd},</if>
+            <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
             <if test="fVolumnd != null">f_volumnD = #{fVolumnd},</if>
+            <if test="fQtyd != null">f_qtyD = #{fQtyd},</if>
             <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
             <if test="fGrossweightd != null">f_grossweightD = #{fGrossweightd},</if>
             <if test="fNetweightd != null">f_netweightD = #{fNetweightd},</if>
@@ -273,12 +280,14 @@
             <if test="fCntrno != null">f_cntrno = #{fCntrno},</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>
             <if test="fMarks != null and fMarks != ''">f_marks = #{fMarks},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="fVolumnblc != null">f_volumnblc = #{fVolumnblc},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
             <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
         </trim>
         where f_accyear = #{fAccyear}

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

@@ -5,59 +5,64 @@
 <mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper">
 
     <resultMap type="TWarehousebills" id="TWarehousebillsResult">
-        <result property="fId" column="f_id"/>
-        <result property="fBillno" column="f_billno"/>
-        <result property="fCustomsdeclartion" column="f_customsdeclartion"/>
-        <result property="fOriginalbillno" column="f_originalbillno"/>
-        <result property="fDeptid" column="f_deptid"/>
-        <result property="fBsdeptid" column="f_bsdeptid"/>
-        <result property="fContacts" column="f_contacts"/>
-        <result property="fTel" column="f_tel"/>
-        <result property="fChargedate" column="f_chargedate"/>
-        <result property="fCorpid" column="f_corpid"/>
-        <result property="fTocorpid" column="f_tocorpid"/>
-        <result property="fStltypeid" column="f_stltypeid"/>
-        <result property="fBscorpno" column="f_bscorpno"/>
-        <result property="fWarehouseid" column="f_warehouseid"/>
-        <result property="fStorekeeper" column="f_storekeeper"/>
-        <result property="fBsdate" column="f_bsdate"/>
-        <result property="fPlanqty" column="f_planqty"/>
-        <result property="fPlangrossweight" column="f_plangrossweight"/>
-        <result property="fPlannetweight" column="f_plannetweight"/>
-        <result property="fPlanvolumn" column="f_planvolumn"/>
-        <result property="fQty" column="f_qty"/>
-        <result property="fGrossweight" column="f_grossweight"/>
-        <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"/>
-        <result property="fVslvoy" column="f_vslvoy"/>
-        <result property="fMarks" column="f_marks"/>
-        <result property="fEta" column="f_eta"/>
-        <result property="fCustomno" column="f_customno"/>
-        <result property="fIfweigh" column="f_ifweigh"/>
-        <result property="fIfpledge" column="f_ifpledge"/>
-        <result property="fIfdamage" column="f_ifdamage"/>
-        <result property="fBankcorpid" column="f_bankcorpid"/>
-        <result property="fBilltype" column="f_billtype"/>
-        <result property="fBillstatus" column="f_billstatus"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="fItemsStatus" column="f_items_status"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <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"/>
-        <result property="fReviewDate" column="f_review_date"/>
+        <result property="fId"    column="f_id"    />
+        <result property="fBillno"    column="f_billno"    />
+        <result property="fCustomsdeclartion"    column="f_customsdeclartion"    />
+        <result property="fOriginalbillno"    column="f_originalbillno"    />
+        <result property="fDeptid"    column="f_deptid"    />
+        <result property="fBsdeptid"    column="f_bsdeptid"    />
+        <result property="fContacts"    column="f_contacts"    />
+        <result property="fTel"    column="f_tel"    />
+        <result property="fCorpid"    column="f_corpid"    />
+        <result property="fTocorpid"    column="f_tocorpid"    />
+        <result property="fStltypeid"    column="f_stltypeid"    />
+        <result property="fBscorpno"    column="f_bscorpno"    />
+        <result property="fWarehouseid"    column="f_warehouseid"    />
+        <result property="fStorekeeper"    column="f_storekeeper"    />
+        <result property="fChargedate"    column="f_chargedate"    />
+        <result property="fBsdate"    column="f_bsdate"    />
+        <result property="fPlanqty"    column="f_planqty"    />
+        <result property="fPlangrossweight"    column="f_plangrossweight"    />
+        <result property="fPlannetweight"    column="f_plannetweight"    />
+        <result property="fPlanvolumn"    column="f_planvolumn"    />
+        <result property="fQty"    column="f_qty"    />
+        <result property="fGrossweight"    column="f_grossweight"    />
+        <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"    />
+        <result property="fVslvoy"    column="f_vslvoy"    />
+        <result property="fMarks"    column="f_marks"    />
+        <result property="fEta"    column="f_eta"    />
+        <result property="fCustomno"    column="f_customno"    />
+        <result property="fIfweigh"    column="f_ifweigh"    />
+        <result property="fIfpledge"    column="f_ifpledge"    />
+        <result property="fIfdamage"    column="f_ifdamage"    />
+        <result property="fBankcorpid"    column="f_bankcorpid"    />
+        <result property="fBilltype"    column="f_billtype"    />
+        <result property="fBillstatus"    column="f_billstatus"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="fItemsStatus"    column="f_items_status"    />
+        <result property="updateBy"    column="update_by"    />
+        <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"    />
+        <result property="fReviewDate"    column="f_review_date"    />
+        <result property="fTruckno"    column="f_truckno"    />
+        <result property="fDriverName"    column="f_driver_name"    />
+        <result property="fDriverTel"    column="f_driver_tel"    />
+        <result property="fDriverIdCar"    column="f_driver_id_car"    />
+        <result property="fBusinessType"    column="f_business_type"    />
     </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_chargedate, f_bsdate, f_planqty, f_plangrossweight, f_plannetweight, f_planvolumn, f_qty, f_grossweight, f_netweight, f_volumn, f_billingway, f_trademodeid, f_sbu, f_feetunit, f_mblno, f_vslvoy, f_eta, f_marks, 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, f_review_date 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, f_items_status, update_by, update_time, remark, f_billing_deadline, f_product_name, f_review_date, f_truckno, f_driver_name, f_driver_tel, f_driver_id_car, f_business_type from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -136,6 +141,11 @@
             bill.f_planvolumn AS fPlanvolumn,
             bill.f_bsdate AS fBsdate,
             bill.f_trademodeid AS fTrademodeid,
+            bill.f_truckno AS fTruckno,
+            bill.f_driver_name AS fDriverName,
+            bill.f_driver_tel AS fDriverTel,
+            bill.f_driver_id_car AS fDriverIdCar,
+            bill.f_business_type AS fBusinessType,
             ware.f_name AS fWarehouseid,
             bill.f_qty AS fQty,
             bill.f_netweight AS fNetweight,
@@ -301,13 +311,18 @@
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
             <if test="fItemsStatus != null">f_items_status,</if>
+            <if test="updateBy != null">update_by,</if>
             <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>
             <if test="fReviewDate != null">f_review_date,</if>
+            <if test="fTruckno != null">f_truckno,</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="fBusinessType != null">f_business_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -351,13 +366,18 @@
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
             <if test="fItemsStatus != null">#{fItemsStatus},</if>
+            <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="fBillingDeadline != null">#{fBillingDeadline},</if>
             <if test="fProductName != null">#{fProductName},</if>
             <if test="fReviewDate != null">#{fReviewDate},</if>
+            <if test="fTruckno != null">#{fTruckno},</if>
+            <if test="fDriverName != null">#{fDriverName},</if>
+            <if test="fDriverTel != null">#{fDriverTel},</if>
+            <if test="fDriverIdCar != null">#{fDriverIdCar},</if>
+            <if test="fBusinessType != null">#{fBusinessType},</if>
         </trim>
     </insert>
 
@@ -405,13 +425,18 @@
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="fItemsStatus != null">f_items_status = #{fItemsStatus},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
             <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>
             <if test="fReviewDate != null">f_review_date = #{fReviewDate},</if>
+            <if test="fTruckno != null">f_truckno = #{fTruckno},</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="fBusinessType != null">f_business_type = #{fBusinessType},</if>
         </trim>
         where f_id = #{fId}
     </update>

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

@@ -53,11 +53,12 @@
         <result property="fIsPass" column="f_is_pass"/>
         <result property="fBilltype" column="f_billtype"/>
         <result property="fBillingQty" column="f_billing_qty"/>
+        <result property="fBusinessType" column="f_business_type"/>
         <result property="fBillingDeadline" column="f_billing_deadline"/>
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_srcid, f_lineno, f_billno, f_goodsid, f_warehouselocid, f_mblno, f_bsdate, f_originalbillno, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_billingway, f_transfer_warehouselocid, f_planvolumn, f_planqty, f_originalbilldate, f_plangrossweight, f_packagespecs, f_chargedate, 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, f_billtype, f_billing_qty, f_billing_deadline from t_warehousebillsitems
+        select f_id, f_pid, f_lineno, f_srcid, f_goodsid, f_billno, f_warehouselocid, f_mblno, f_originalbillno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planvolumn, f_originalbilldate, f_transfer_warehouselocid, f_planqty, f_billingway, f_plangrossweight, f_packagespecs, f_chargedate, f_plannetweight, f_qty, f_grossweight, f_volumn, 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, f_billtype, f_billing_qty, f_billing_deadline, f_business_type from t_warehousebillsitems
     </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
@@ -82,6 +83,7 @@
             <if test="fPlanqty != null ">and f_planqty = #{fPlanqty}</if>
             <if test="fPlanvolumn != null ">and f_planvolumn = #{fPlanvolumn}</if>
             <if test="fChargedate != null ">and f_chargedate = #{fChargedate}</if>
+            <if test="fBusinessType != null "> and f_business_type = #{fBusinessType}</if>
             <if test="fPackagespecs != null ">and f_packagespecs = #{fPackagespecs}</if>
             <if test="fPlangrossweight != null ">and f_plangrossweight = #{fPlangrossweight}</if>
             <if test="fPlannetweight != null ">and f_plannetweight = #{fPlannetweight}</if>
@@ -143,6 +145,7 @@
             item.f_serial_number AS fSerialNumber,
             item.f_marks AS fMarks,
             item.f_grossweight AS fGrossweight,
+            item.f_business_type AS fBusinessType,
             item.f_netweight AS fNetweight,
             item.f_cntrno AS fCntrno,
             item.f_truckno AS fTruckno,
@@ -167,30 +170,30 @@
         insert into t_warehousebillsitems
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fPid != null">f_pid,</if>
-            <if test="fSrcid != null">f_srcid,</if>
             <if test="fLineno != null">f_lineno,</if>
-            <if test="fBillno != null">f_billno,</if>
+            <if test="fSrcid != null">f_srcid,</if>
             <if test="fGoodsid != null">f_goodsid,</if>
+            <if test="fBillno != null">f_billno,</if>
             <if test="fWarehouselocid != null">f_warehouselocid,</if>
             <if test="fMblno != null">f_mblno,</if>
-            <if test="fBsdate != null">f_bsdate,</if>
             <if test="fOriginalbillno != null">f_originalbillno,</if>
+            <if test="fBsdate != null">f_bsdate,</if>
             <if test="fBoxno != null">f_boxno,</if>
             <if test="fCntqty != null">f_cntqty,</if>
             <if test="fGoodsval != null">f_goodsval,</if>
             <if test="fCntrtype != null">f_cntrtype,</if>
-            <if test="fBillingway != null">f_billingway,</if>
-            <if test="fTransferWarehouselocid != null">f_transfer_warehouselocid,</if>
             <if test="fPlanvolumn != null">f_planvolumn,</if>
-            <if test="fPlanqty != null">f_planqty,</if>
             <if test="fOriginalbilldate != null">f_originalbilldate,</if>
+            <if test="fTransferWarehouselocid != null">f_transfer_warehouselocid,</if>
+            <if test="fPlanqty != null">f_planqty,</if>
+            <if test="fBillingway != null">f_billingway,</if>
             <if test="fPlangrossweight != null">f_plangrossweight,</if>
             <if test="fPackagespecs != null">f_packagespecs,</if>
             <if test="fChargedate != null">f_chargedate,</if>
             <if test="fPlannetweight != null">f_plannetweight,</if>
             <if test="fQty != null">f_qty,</if>
-            <if test="fVolumn != null">f_volumn,</if>
             <if test="fGrossweight != null">f_grossweight,</if>
+            <if test="fVolumn != null">f_volumn,</if>
             <if test="fNetweight != null">f_netweight,</if>
             <if test="fCntrno != null">f_cntrno,</if>
             <if test="fTruckno != null">f_truckno,</if>
@@ -214,33 +217,34 @@
             <if test="fBilltype != null">f_billtype,</if>
             <if test="fBillingQty != null">f_billing_qty,</if>
             <if test="fBillingDeadline != null">f_billing_deadline,</if>
+            <if test="fBusinessType != null">f_business_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
-            <if test="fSrcid != null">#{fSrcid},</if>
             <if test="fLineno != null">#{fLineno},</if>
-            <if test="fBillno != null">#{fBillno},</if>
+            <if test="fSrcid != null">#{fSrcid},</if>
             <if test="fGoodsid != null">#{fGoodsid},</if>
+            <if test="fBillno != null">#{fBillno},</if>
             <if test="fWarehouselocid != null">#{fWarehouselocid},</if>
             <if test="fMblno != null">#{fMblno},</if>
-            <if test="fBsdate != null">#{fBsdate},</if>
             <if test="fOriginalbillno != null">#{fOriginalbillno},</if>
+            <if test="fBsdate != null">#{fBsdate},</if>
             <if test="fBoxno != null">#{fBoxno},</if>
             <if test="fCntqty != null">#{fCntqty},</if>
             <if test="fGoodsval != null">#{fGoodsval},</if>
             <if test="fCntrtype != null">#{fCntrtype},</if>
-            <if test="fBillingway != null">#{fBillingway},</if>
-            <if test="fTransferWarehouselocid != null">#{fTransferWarehouselocid},</if>
             <if test="fPlanvolumn != null">#{fPlanvolumn},</if>
-            <if test="fPlanqty != null">#{fPlanqty},</if>
             <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
+            <if test="fTransferWarehouselocid != null">#{fTransferWarehouselocid},</if>
+            <if test="fPlanqty != null">#{fPlanqty},</if>
+            <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fPlangrossweight != null">#{fPlangrossweight},</if>
             <if test="fPackagespecs != null">#{fPackagespecs},</if>
             <if test="fChargedate != null">#{fChargedate},</if>
             <if test="fPlannetweight != null">#{fPlannetweight},</if>
             <if test="fQty != null">#{fQty},</if>
-            <if test="fVolumn != null">#{fVolumn},</if>
             <if test="fGrossweight != null">#{fGrossweight},</if>
+            <if test="fVolumn != null">#{fVolumn},</if>
             <if test="fNetweight != null">#{fNetweight},</if>
             <if test="fCntrno != null">#{fCntrno},</if>
             <if test="fTruckno != null">#{fTruckno},</if>
@@ -264,6 +268,7 @@
             <if test="fBilltype != null">#{fBilltype},</if>
             <if test="fBillingQty != null">#{fBillingQty},</if>
             <if test="fBillingDeadline != null">#{fBillingDeadline},</if>
+            <if test="fBusinessType != null">#{fBusinessType},</if>
         </trim>
     </insert>
 
@@ -271,30 +276,30 @@
         update t_warehousebillsitems
         <trim prefix="SET" suffixOverrides=",">
             <if test="fPid != null">f_pid = #{fPid},</if>
-            <if test="fSrcid != null">f_srcid = #{fSrcid},</if>
             <if test="fLineno != null">f_lineno = #{fLineno},</if>
-            <if test="fBillno != null">f_billno = #{fBillno},</if>
+            <if test="fSrcid != null">f_srcid = #{fSrcid},</if>
             <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
+            <if test="fBillno != null">f_billno = #{fBillno},</if>
             <if test="fWarehouselocid != null">f_warehouselocid = #{fWarehouselocid},</if>
             <if test="fMblno != null">f_mblno = #{fMblno},</if>
-            <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
             <if test="fOriginalbillno != null">f_originalbillno = #{fOriginalbillno},</if>
+            <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
             <if test="fBoxno != null">f_boxno = #{fBoxno},</if>
             <if test="fCntqty != null">f_cntqty = #{fCntqty},</if>
             <if test="fGoodsval != null">f_goodsval = #{fGoodsval},</if>
             <if test="fCntrtype != null">f_cntrtype = #{fCntrtype},</if>
-            <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
-            <if test="fTransferWarehouselocid != null">f_transfer_warehouselocid = #{fTransferWarehouselocid},</if>
             <if test="fPlanvolumn != null">f_planvolumn = #{fPlanvolumn},</if>
-            <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
             <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
+            <if test="fTransferWarehouselocid != null">f_transfer_warehouselocid = #{fTransferWarehouselocid},</if>
+            <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
+            <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
             <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</if>
             <if test="fPackagespecs != null">f_packagespecs = #{fPackagespecs},</if>
             <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
             <if test="fPlannetweight != null">f_plannetweight = #{fPlannetweight},</if>
             <if test="fQty != null">f_qty = #{fQty},</if>
-            <if test="fVolumn != null">f_volumn = #{fVolumn},</if>
             <if test="fGrossweight != null">f_grossweight = #{fGrossweight},</if>
+            <if test="fVolumn != null">f_volumn = #{fVolumn},</if>
             <if test="fNetweight != null">f_netweight = #{fNetweight},</if>
             <if test="fCntrno != null">f_cntrno = #{fCntrno},</if>
             <if test="fTruckno != null">f_truckno = #{fTruckno},</if>
@@ -318,6 +323,7 @@
             <if test="fBilltype != null">f_billtype = #{fBilltype},</if>
             <if test="fBillingQty != null">f_billing_qty = #{fBillingQty},</if>
             <if test="fBillingDeadline != null">f_billing_deadline = #{fBillingDeadline},</if>
+            <if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
         </trim>
         where f_id = #{fId}
     </update>