[CODE]: 仓储主表加字段

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

@@ -310,6 +310,13 @@ public class TWarehouseBills extends BaseEntity {
     private Long fLabour ;
 
     /**
+     * 调拨模块使用(出库仓库)
+     */
+    @Excel(name = "调拨仓库使用的")
+    private Long fInwarehouseid ;
+
+
+    /**
      * 查询时间区间
      */
     private List<String> timeInterval;
@@ -744,6 +751,16 @@ public class TWarehouseBills extends BaseEntity {
         this.fLabour = fLabour;
     }
 
+    public Long getfInwarehouseid() {
+        return fInwarehouseid;
+    }
+
+    public void setfInwarehouseid(Long fInwarehouseid) {
+        this.fInwarehouseid = fInwarehouseid;
+    }
+
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -61,6 +61,7 @@
         <result property="fBusinessType"    column="f_business_type"    />
         <result property="fLabour"    column="f_labour"    />
         <result property="fFleet"    column="f_fleet"    />
+        <result property="fInwarehouseid"    column="f_inwarehouseid"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -68,7 +69,7 @@
                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_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
@@ -89,6 +90,7 @@
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and f_originalbillno = #{fOriginalbillno}</if>
             <if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
             <if test="fBsdeptid != null ">and f_bsdeptid = #{fBsdeptid}</if>
+            <if test="fInwarehouseid != null ">and f_inwarehouseid = #{fInwarehouseid}</if>
             <if test="fContacts != null  and fContacts != ''">and f_contacts = #{fContacts}</if>
             <if test="fTel != null  and fTel != ''">and f_tel = #{fTel}</if>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
@@ -159,6 +161,7 @@
             bill.f_qty AS fQty,
             bill.f_netweight AS fNetweight,
             bill.create_time AS createTime,
+            bill.f_inwarehouseid AS fInwarehouseid,
             bill.create_by AS createBy,
             bill.f_grossweight AS fGrossweight,
             bill.f_product_name AS fProductName,
@@ -185,6 +188,7 @@
                 #{fOriginalbillno}
             </if>
             <if test="fDeptid != null ">and bill.f_deptid = #{fDeptid}</if>
+            <if test="fInwarehouseid != null ">and bill.f_inwarehouseid = #{fInwarehouseid}</if>
             <if test="fBsdeptid != null ">and bill.f_bsdeptid = #{fBsdeptid}</if>
             <if test="fChargedate != null ">and bill.f_chargedate = #{fChargedate}</if>
             <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
@@ -371,6 +375,7 @@
             <if test="fBusinessType != null">f_business_type,</if>
             <if test="fLabour != null">f_labour,</if>
             <if test="fFleet != null">f_fleet,</if>
+            <if test="fInwarehouseid != null">f_inwarehouseid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -428,6 +433,7 @@
             <if test="fBusinessType != null">#{fBusinessType},</if>
             <if test="fLabour != null">#{fLabour},</if>
             <if test="fFleet != null">#{fFleet},</if>
+            <if test="fInwarehouseid != null">#{fInwarehouseid},</if>
         </trim>
     </insert>
 
@@ -490,6 +496,7 @@
             <if test="fReviewDate == null">f_review_date = null,</if>
             <if test="fLabour  != null">f_labour  = #{fLabour },</if>
             <if test="fFleet != null">f_fleet = #{fFleet},</if>
+            <if test="fInwarehouseid != null">f_inwarehouseid = #{fInwarehouseid},</if>
         </trim>
         where f_id = #{fId}
     </update>