Browse Source

账单明细查询和导出添加汇率和明细

wangzhuo 1 year ago
parent
commit
6176547727

+ 27 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/QueryMenu.java

@@ -87,6 +87,17 @@ public class QueryMenu {
     private BigDecimal fAmount;
 
     /**
+     * 汇率
+     */
+    @Excel(name = "汇率")
+    private String fExrate;
+    /**
+     * 税率
+     */
+    @Excel(name = "税率")
+    private String fTaxrate;
+
+    /**
      * 结算金额
      */
     @Excel(name = "结算金额")
@@ -187,6 +198,22 @@ public class QueryMenu {
     @Excel(name = "出口单号")
     private String fEmblno;
 
+    public String getfExrate() {
+        return fExrate;
+    }
+
+    public void setfExrate(String fExrate) {
+        this.fExrate = fExrate;
+    }
+
+    public String getfTaxrate() {
+        return fTaxrate;
+    }
+
+    public void setfTaxrate(String fTaxrate) {
+        this.fTaxrate = fTaxrate;
+    }
+
     public Date getfBillingDeadline() {
         return fBillingDeadline;
     }

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

@@ -982,6 +982,8 @@
         tf.f_chargedate AS fChargedate,
         tf.f_billing_deadline AS fBillingDeadline,
         tf.f_originalbilldate AS fOriginalbilldate,
+        tf.f_exrate AS fExrate,
+        tf.f_taxrate AS fTaxrate,
         CASE
         WHEN tf.f_billstatus = '1' THEN '录入'
         WHEN tf.f_billstatus = '2' THEN '暂存'