[CODE]: 仓储业务添加字段

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

@@ -315,6 +315,19 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "调拨仓库使用的")
     private Long fInwarehouseid ;
 
+    /**
+     *   业务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "业务时间", width = 30, dateFormat = "yyyy-MM-dd  HH:mm:ss")
+    private Date fBstime;
+
+    /**
+     *   车辆类型
+     */
+    @Excel(name = "车辆类型")
+    private Long fCartype ;
+
 
     /**
      * 查询时间区间
@@ -771,7 +784,21 @@ public class TWarehouseBills extends BaseEntity {
         this.fInwarehouseid = fInwarehouseid;
     }
 
+    public Date getfBstime() {
+        return fBstime;
+    }
+
+    public void setfBstime(Date fBstime) {
+        this.fBstime = fBstime;
+    }
 
+    public Long getfCartype() {
+        return fCartype;
+    }
+
+    public void setfCartype(Long fCartype) {
+        this.fCartype = fCartype;
+    }
 
     @Override
     public String toString() {

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

@@ -62,6 +62,8 @@
         <result property="fLabour"    column="f_labour"    />
         <result property="fFleet"    column="f_fleet"    />
         <result property="fInwarehouseid"    column="f_inwarehouseid"    />
+        <result property="fBstime"    column="f_bstime"    />
+        <result property="fCartype"    column="f_cartype"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -72,7 +74,8 @@
                f_sbu, f_feetunit, f_mblno, f_vslvoy, f_inwarehouseid, 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,f_labour,f_fleet  from t_warehousebills
+               f_review_date, f_truckno, f_driver_name, f_driver_tel, f_driver_id_car, f_business_type,f_labour,f_fleet,
+               f_bstime,f_cartype  from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -443,6 +446,8 @@
             <if test="fLabour != null">f_labour,</if>
             <if test="fFleet != null">f_fleet,</if>
             <if test="fInwarehouseid != null">f_inwarehouseid,</if>
+            <if test="fBstime != null">f_bstime,</if>
+            <if test="fCartype != null">f_cartype,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -501,6 +506,8 @@
             <if test="fLabour != null">#{fLabour},</if>
             <if test="fFleet != null">#{fFleet},</if>
             <if test="fInwarehouseid != null">#{fInwarehouseid},</if>
+            <if test="fBstime != null">#{fBstime},</if>
+            <if test="fCartype != null">#{fCartype},</if>
         </trim>
     </insert>
 
@@ -564,6 +571,8 @@
             <if test="fLabour  != null">f_labour  = #{fLabour },</if>
             <if test="fFleet != null">f_fleet = #{fFleet},</if>
             <if test="fInwarehouseid != null">f_inwarehouseid = #{fInwarehouseid},</if>
+            <if test="fBstime != null">f_bstime = #{fBstime},</if>
+            <if test="fCartype != null">f_cartype = #{fCartype},</if>
         </trim>
         where f_id = #{fId}
     </update>