凯和费用主表加开票备注

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TFee.java

@@ -215,6 +215,9 @@ public class TFee extends BaseEntity {
     /** 是否对账 */
     @Excel(name = "是否对账")
     private String fReconciliation;
+    /** 开票备注 */
+    @Excel(name = "开票备注")
+    private String invoiceRemarks;
     /**申请金额区间*/
     private List<String> money;
 
@@ -643,6 +646,14 @@ public class TFee extends BaseEntity {
         this.srcBillNo = srcBillNo;
     }
 
+    public String getInvoiceRemarks() {
+        return invoiceRemarks;
+    }
+
+    public void setInvoiceRemarks(String invoiceRemarks) {
+        this.invoiceRemarks = invoiceRemarks;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -681,6 +692,7 @@ public class TFee extends BaseEntity {
                 .append("fBankNumber", getfBankNumber())
                 .append("fReconciliation", getfReconciliation())
                 .append("srcBillNo", getSrcBillNo())
+                .append("invoiceRemarks",getInvoiceRemarks())
                 .toString();
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/shipping/FinancialTFee.java

@@ -74,6 +74,10 @@ public class FinancialTFee implements Serializable {
     @Excel(name = "备注")
     private String fRemarks;
     /**
+     * 开票备注
+     */
+    private String invoiceRemarks;
+    /**
      *银行账号
      */
     private String fBankNumber;
@@ -490,6 +494,14 @@ public class FinancialTFee implements Serializable {
         this.bank = bank;
     }
 
+    public String getInvoiceRemarks() {
+        return invoiceRemarks;
+    }
+
+    public void setInvoiceRemarks(String invoiceRemarks) {
+        this.invoiceRemarks = invoiceRemarks;
+    }
+
     @Override
     public String toString() {
         return "FinancialTFee{" +
@@ -532,6 +544,7 @@ public class FinancialTFee implements Serializable {
                 ", fBillstatusName='" + fBillstatusName + '\'' +
                 ", fBillno='" + fBillno + '\'' +
                 ", bank='" + bank + '\'' +
+                ", invoiceRemarks='" + invoiceRemarks + '\'' +
                 '}';
     }
 }

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -46,6 +46,7 @@
         <result property="fDc"    column="f_dc"    />
         <result property="fBankNumber"    column="f_bank_number"    />
         <result property="fReconciliation"    column="f_reconciliation"    />
+        <result property="invoiceRemarks"    column="invoice_remarks"    />
     </resultMap>
 
     <sql id="selectTFeeVo">
@@ -89,7 +90,8 @@
                f_destportid,
                f_dc,
                f_bank_number,
-               f_reconciliation
+               f_reconciliation,
+               invoice_remarks
         from t_fee
     </sql>
 
@@ -301,6 +303,7 @@
         ts.f_name AS destportName,
         f.f_bank_number AS fBankNumber,
         f.bank AS bank,
+        f.invoice_remarks AS invoiceRemarks,
         CASE
 
         WHEN f.f_dc = 'D' THEN
@@ -517,6 +520,7 @@
             <if test="fDc != null">f_dc,</if>
             <if test="fBankNumber != null">f_bank_number,</if>
             <if test="fReconciliation != null">f_reconciliation,</if>
+            <if test="invoiceRemarks != null">invoice_remarks,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fId != null">#{fId},</if>
@@ -560,6 +564,7 @@
             <if test="fDc != null">#{fDc},</if>
             <if test="fBankNumber != null">#{fBankNumber},</if>
             <if test="fReconciliation != null">#{fReconciliation},</if>
+            <if test="invoiceRemarks != null">#{invoiceRemarks},</if>
         </trim>
     </insert>
 
@@ -606,6 +611,7 @@
             <if test="fDc != null">f_dc = #{fDc},</if>
             <if test="fBankNumber != null">f_bank_number = #{fBankNumber},</if>
             <if test="fReconciliation != null">f_reconciliation = #{fReconciliation},</if>
+            <if test="invoiceRemarks != null">invoice_remarks = #{invoiceRemarks},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -2178,6 +2184,9 @@
             <if test='map.tWareHouseFees.fDc != null and map.tWareHouseFees.fDc != ""'>
                 and w.f_dc = #{map.tWareHouseFees.fDc}
             </if>
+            <if test="map.tWareHouseFees.fStatementNo != null and map.tWareHouseFees.fStatementNo != ''">and
+                w.f_statement_no = #{map.tWareHouseFees.fStatementNo}
+            </if>
             <if test="map.tWareHouseFees.fBillstatus != null">and w.f_billstatus = #{map.tWareHouseFees.fBillstatus}
             </if>
             <if test="map.tWareHouseFees.fVslid != null">and t.f_vslid = #{map.tWareHouseFees.fVslid}</if>
@@ -2249,6 +2258,7 @@
         f.f_dc As fDc,
         f.f_reconciliation AS fReconciliation,
         f.bank AS bank,
+        f.invoice_remarks AS invoiceRemarks,
         CASE
 
         WHEN f.f_dc = 'D' THEN