报表添加币别

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/AcountbalanceView.java

@@ -28,6 +28,16 @@ public class AcountbalanceView {
     private String remark;
     private Integer companyId;
 
+    private String currency;
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
     public Integer getCompanyId() {
         return companyId;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -48,6 +48,16 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
 
     private String bl_item;
 
+    private String bk_currency;
+
+    public String getBk_currency() {
+        return bk_currency;
+    }
+
+    public void setBk_currency(String bk_currency) {
+        this.bk_currency = bk_currency;
+    }
+
     public Double getBl_orderamount() {
         return bl_orderamount;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/CustomerCheckView.java

@@ -11,6 +11,8 @@ public class CustomerCheckView {
 
     private String pi_custname;
 
+    private  String pi_currency;
+
     private Date pi_date;
 
     private Integer pd_pdno;
@@ -200,4 +202,12 @@ public class CustomerCheckView {
     public void setPd_nettotal(Double pd_nettotal) {
         this.pd_nettotal = pd_nettotal;
     }
+
+    public String getPi_currency() {
+        return pi_currency;
+    }
+
+    public void setPi_currency(String pi_currency) {
+        this.pi_currency = pi_currency;
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAcountView.java

@@ -11,6 +11,8 @@ public class VendorAcountView {
 
     private String pi_vendname;
 
+    private String pi_currency;
+
     private Date pi_date;
 
     private Integer pd_pdno;
@@ -215,4 +217,12 @@ public class VendorAcountView {
     public void setPd_nettotal(Double pd_nettotal) {
         this.pd_nettotal = pd_nettotal;
     }
+
+    public String getPi_currency() {
+        return pi_currency;
+    }
+
+    public void setPi_currency(String pi_currency) {
+        this.pi_currency = pi_currency;
+    }
 }

applications/money/money-server/src/main/resources/mapper/AcountbalanceViewMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.AcountbalanceView" >
     <result column="bankcode" property="bankcode" jdbcType="VARCHAR" />
     <result column="bankname" property="bankname" jdbcType="VARCHAR" />
+    <result column="currency" property="currency" jdbcType="VARCHAR" />
     <result column="bankid" property="bankid" jdbcType="INTEGER" />
     <result column="date" property="date" jdbcType="TIMESTAMP" />
     <result column="kind" property="kind" jdbcType="VARCHAR" />

applications/money/money-server/src/main/resources/mapper/BanksubledgerMapper.xml

@@ -7,6 +7,7 @@
         <result column="bl_bankid" jdbcType="INTEGER" property="bl_bankid" />
         <result column="bl_bankcode" jdbcType="VARCHAR" property="bl_bankcode" />
         <result column="bl_bankname" jdbcType="VARCHAR" property="bl_bankname" />
+        <result column="bk_currency" jdbcType="VARCHAR" property="bk_currency" />
         <result column="bl_code" jdbcType="VARCHAR" property="bl_code" />
         <result column="bl_kind" jdbcType="VARCHAR" property="bl_kind" />
         <result column="bl_date" jdbcType="TIMESTAMP" property="bl_date" />
@@ -457,14 +458,14 @@
     <select id="selectByCondition" resultMap="BaseResultMap">
         select *
         from
-        (select  bl_date, bl_code, bl_kind,bl_bankcode,bl_bankid, bl_bankname, bl_income, bl_spending, bl_assname, bl_remark, companyid
-        from banksubledger where bl_kind in ('其他收入单', '其他支出单'))a
+        (select  bk_currency,bl_date, bl_code, bl_kind,bl_bankcode,bl_bankid, bl_bankname, bl_income, bl_spending, bl_assname, bl_remark, banksubledger.companyid
+        from banksubledger left join bankinformation on bk_id = bl_bankid where bl_kind in ('其他收入单', '其他支出单'))a
         <where>
             <if test="con != null">
-            ${con}
+                ${con}
             </if>
             <if test="companyId != null">
-            and  companyId = #{companyId}
+                and  companyId = #{companyId}
             </if>
         </where>
         order by bl_bankname asc, bl_date desc,bl_bankcode desc

applications/money/money-server/src/main/resources/mapper/CustomerCheckViewMapper.xml

@@ -6,6 +6,7 @@
         <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
         <result column="pi_custcode" property="pi_custcode" jdbcType="VARCHAR" />
         <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
+        <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
         <result column="pi_date" property="pi_date" jdbcType="TIMESTAMP" />
         <result column="pd_pdno" property="pd_pdno" jdbcType="INTEGER" />
         <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />

applications/money/money-server/src/main/resources/mapper/VendorAcountViewMapper.xml

@@ -6,6 +6,7 @@
     <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
     <result column="pi_vendcode" property="pi_vendcode" jdbcType="VARCHAR" />
     <result column="pi_vendname" property="pi_vendname" jdbcType="VARCHAR" />
+    <result column="pi_currency" property="pi_currency" jdbcType="VARCHAR" />
     <result column="pi_date" property="pi_date" jdbcType="TIMESTAMP" />
     <result column="pd_pdno" property="pd_pdno" jdbcType="INTEGER" />
     <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -69,6 +69,10 @@ Ext.define('saas.view.money.report.AccountBalance', {
         summaryRenderer: function(v, d, f, m) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '币别',
+        dataIndex: 'currency',
+        width: 80,
     }, {
         text: '往来单位',
         dataIndex: 'bname',

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -160,6 +160,10 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '币别',
+        dataIndex: 'pi_currency',
+        width: 80
     }],
 
     listeners: {

frontend/saas-web/app/view/money/report/OtherIODetail.js

@@ -107,6 +107,10 @@ Ext.define('saas.view.money.report.OtherIODetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
+        text: '币别',
+        dataIndex: 'bk_currency',
+        width: 80,
+    },{
         text: '往来单位',
         dataIndex: 'bl_assname',
         width: 200,

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -161,6 +161,10 @@ Ext.define('saas.view.money.report.VendorCheck', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '币别',
+        dataIndex: 'pi_currency',
+        width: 80
     }],
 
     listeners: {