添加 仓库费用明细字段

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

@@ -54,6 +54,13 @@ public class TWarehousebillsfees extends BaseEntity {
     private Long fFeeUnitid;
 
     /**
+     * 审核日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fReviewDate;
+
+    /**
      * 数量
      */
     @Excel(name = "数量")
@@ -216,6 +223,14 @@ public class TWarehousebillsfees extends BaseEntity {
         return fFeeUnitid;
     }
 
+    public void setfReviewDate(Date fReviewDate) {
+        this.fReviewDate = fReviewDate;
+    }
+
+    public Date getfReviewDate() {
+        return fReviewDate;
+    }
+
     public void setfQty(BigDecimal fQty) {
         this.fQty = fQty;
     }
@@ -386,6 +401,7 @@ public class TWarehousebillsfees extends BaseEntity {
                 .append("fDc", getfDc())
                 .append("fBillstatus", getfBillstatus())
                 .append("fAccamount", getfAccamount())
+                .append("fReviewDate", getfReviewDate())
                 .append("fStatementNo", getfStatementNo())
                 .append("fStlamount", getfStlamount())
                 .append("fInvnos", getfInvnos())

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

@@ -13,6 +13,7 @@
         <result property="fFeeunitid" column="f_feeUnitid"/>
         <result property="fQty" column="f_qty"/>
         <result property="fUnitprice" column="f_unitprice"/>
+        <result property="fReviewDate" column="f_review_date"/>
         <result property="fAmount" column="f_amount"/>
         <result property="fCurrency" column="f_currency"/>
         <result property="fExrate" column="f_exrate"/>
@@ -38,7 +39,7 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsfeesVo">
-        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_billstatus, f_accamount, f_statement_no, f_stlamount, f_invnos, f_accamount_date, f_invamount, f_stlamount_no, f_askamount, f_stlamount_date, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsfees
+        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_review_date, f_exrate, f_taxrate, f_dc, f_billstatus, f_accamount, f_statement_no, f_stlamount, f_invnos, f_accamount_date, f_invamount, f_stlamount_no, f_askamount, f_stlamount_date, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsfees
     </sql>
 
     <select id="selectTWarehousebillsfeesList" parameterType="TWarehousebillsfees"
@@ -55,6 +56,7 @@
             <if test="fAmount != null ">and f_amount = #{fAmount}</if>
             <if test="fCurrency != null  and fCurrency != ''">and f_currency = #{fCurrency}</if>
             <if test="fExrate != null ">and f_exrate = #{fExrate}</if>
+            <if test="fReviewDate != null ">and f_review_date = #{fReviewDate}</if>
             <if test="fTaxrate != null ">and f_taxrate = #{fTaxrate}</if>
             <if test="fDc != null  and fDc != ''">and f_dc = #{fDc}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
@@ -92,17 +94,18 @@
             <if test="fExrate != null">f_exrate,</if>
             <if test="fTaxrate != null">f_taxrate,</if>
             <if test="fDc != null">f_dc,</if>
+            <if test="fReviewDate != null">f_review_date,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
             <if test="fAccamount != null">f_accamount,</if>
             <if test="fStatementNo != null">f_statement_no,</if>
             <if test="fStlamount != null">f_stlamount,</if>
             <if test="fInvnos != null">f_invnos,</if>
-            <if test="fAccamountDate != null">f_accamount_date,</if>
             <if test="fInvamount != null">f_invamount,</if>
-            <if test="fStlamountNo != null">f_stlamount_no,</if>
+            <if test="fAccamountDate != null">f_accamount_date,</if>
             <if test="fAskamount != null">f_askamount,</if>
-            <if test="fStlamountDate != null">f_stlamount_date,</if>
+            <if test="fStlamountNo != null">f_stlamount_no,</if>
             <if test="fStatus != null">f_status,</if>
+            <if test="fStlamountDate != null">f_stlamount_date,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -115,7 +118,7 @@
             <if test="fLineno != null">#{fLineno},</if>
             <if test="fCorpid != null">#{fCorpid},</if>
             <if test="fFeeid != null">#{fFeeid},</if>
-            <if test="fFeeUnitid != null">#{fFeeUnitid},</if>
+            <if test="fFeeunitid != null">#{fFeeunitid},</if>
             <if test="fQty != null">#{fQty},</if>
             <if test="fUnitprice != null">#{fUnitprice},</if>
             <if test="fAmount != null">#{fAmount},</if>
@@ -123,17 +126,18 @@
             <if test="fExrate != null">#{fExrate},</if>
             <if test="fTaxrate != null">#{fTaxrate},</if>
             <if test="fDc != null">#{fDc},</if>
+            <if test="fReviewDate != null">#{fReviewDate},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
             <if test="fAccamount != null">#{fAccamount},</if>
             <if test="fStatementNo != null">#{fStatementNo},</if>
             <if test="fStlamount != null">#{fStlamount},</if>
             <if test="fInvnos != null">#{fInvnos},</if>
-            <if test="fAccamountDate != null">#{fAccamountDate},</if>
             <if test="fInvamount != null">#{fInvamount},</if>
-            <if test="fStlamountNo != null">#{fStlamountNo},</if>
+            <if test="fAccamountDate != null">#{fAccamountDate},</if>
             <if test="fAskamount != null">#{fAskamount},</if>
-            <if test="fStlamountDate != null">#{fStlamountDate},</if>
+            <if test="fStlamountNo != null">#{fStlamountNo},</if>
             <if test="fStatus != null">#{fStatus},</if>
+            <if test="fStlamountDate != null">#{fStlamountDate},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -159,6 +163,7 @@
             <if test="fTaxrate != null">f_taxrate = #{fTaxrate},</if>
             <if test="fDc != null">f_dc = #{fDc},</if>
             <if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
+            <if test="fReviewDate != null">f_review_date = #{fReviewDate},</if>
             <if test="fAccamount != null">f_accamount = #{fAccamount},</if>
             <if test="fStatementNo != null">f_statement_no = #{fStatementNo},</if>
             <if test="fStlamount != null">f_stlamount = #{fStlamount},</if>
@@ -194,4 +199,15 @@
         </foreach>
     </delete>
 
+    <update id="warehouseFeesFollowUpdate">
+        update
+        t_warehousebillsfees
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fettle != null">f_billstatus = #{fettle},</if>
+            <if test="fettle != null and fettle == 6">update_by = #{updateBy},</if>
+        </trim>
+        where
+        f_pid = #{fPid}
+    </update>
+
 </mapper>