添加仓库主表字段 fReviewDate

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

@@ -266,6 +266,11 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "库存明细状态")
     private Long fItemsStatus;
 
+    /** 审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fReviewDate;
+
     /**
      *  仓储费计费截至日期
      */
@@ -636,6 +641,14 @@ public class TWarehouseBills extends BaseEntity {
         this.fItemsStatus = fItemsStatus;
     }
 
+    public Date getfReviewDate() {
+        return fReviewDate;
+    }
+
+    public void setfReviewDate(Date fReviewDate) {
+        this.fReviewDate = fReviewDate;
+    }
+
     public Date getfBillingDeadline() {
         return fBillingDeadline;
     }
@@ -669,6 +682,8 @@ public class TWarehouseBills extends BaseEntity {
                 .append("fPlannetweight", getfPlannetweight())
                 .append("fPlanvolumn", getfPlanvolumn())
                 .append("fQty", getfQty())
+                .append("fItemsStatus", getfItemsStatus())
+                .append("fReviewDate", getfReviewDate())
                 .append("fGrossweight", getfGrossweight())
                 .append("fNetweight", getfNetweight())
                 .append("fVolumn", getfVolumn())

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

@@ -53,10 +53,11 @@
         <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"/>
     </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_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, update_by, f_items_status, update_time, remark, f_billing_deadline, f_product_name 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_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
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -167,6 +168,7 @@
             <if test="fTocorpid != null ">and bill.f_tocorpid = #{fTocorpid}</if>
             <if test="fMarks != null  and fMarks != ''">and bill.f_marks like concat('%', #{fMarks}, '%')</if>
             <if test="fStltypeid != null ">and bill.f_stltypeid = #{fStltypeid}</if>
+            <if test="fReviewDate != null "> and f_review_date = #{fReviewDate}</if>
             <if test="fBscorpno != null  and fBscorpno != ''">and bill.f_bscorpno = #{fBscorpno}</if>
             <if test="fWarehouseid != null ">and bill.f_warehouseid = #{fWarehouseid}</if>
             <if test="fStorekeeper != null  and fStorekeeper != ''">and bill.f_storekeeper = #{fStorekeeper}</if>
@@ -254,6 +256,7 @@
             <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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -303,6 +306,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="fBillingDeadline != null">#{fBillingDeadline},</if>
             <if test="fProductName != null">#{fProductName},</if>
+            <if test="fReviewDate != null">#{fReviewDate},</if>
         </trim>
     </insert>
 
@@ -356,6 +360,7 @@
             <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>
         </trim>
         where f_id = #{fId}
     </update>