1.添加币别汇率字段

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationListDTO.java

@@ -128,4 +128,7 @@ public class VerificationListDTO implements Serializable {
     private String vcd_text4;
 
     private String vcd_text5;
+    private String vc_currency;
+
+    private Double vc_rate;
 }

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

@@ -44,6 +44,42 @@ public class Fundtransfer extends CommonBaseEntity implements Serializable {
 
     private Date ft_auditdate;
 
+    private String ftd_currency;
+    private String ftd_incurrency;
+    private Double ftd_innowbalance;
+    private Double ftd_rate;
+
+    public String getFtd_currency() {
+        return ftd_currency;
+    }
+
+    public void setFtd_currency(String ftd_currency) {
+        this.ftd_currency = ftd_currency;
+    }
+
+    public String getFtd_incurrency() {
+        return ftd_incurrency;
+    }
+
+    public void setFtd_incurrency(String ftd_incurrency) {
+        this.ftd_incurrency = ftd_incurrency;
+    }
+
+    public Double getFtd_innowbalance() {
+        return ftd_innowbalance;
+    }
+
+    public void setFtd_innowbalance(Double ftd_innowbalance) {
+        this.ftd_innowbalance = ftd_innowbalance;
+    }
+
+    public Double getFtd_rate() {
+        return ftd_rate;
+    }
+
+    public void setFtd_rate(Double ftd_rate) {
+        this.ftd_rate = ftd_rate;
+    }
 
     public String getFtd_remark() {
         return ftd_remark;

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

@@ -96,6 +96,9 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
     private String vd_text4;
 
     private String vd_text5;
+    private String vc_currency;
+
+    private Double vc_rate;
 //
 //    private Integer vcd_id;
 //

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

@@ -27,6 +27,11 @@
     <result column="ft_auditman" property="ft_auditman" jdbcType="VARCHAR" />
     <result column="ft_auditdate" property="ft_auditdate" jdbcType="TIMESTAMP" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+
+    <result column="ftd_currency" property="ftd_currency" jdbcType="VARCHAR" />
+    <result column="ftd_incurrency" property="ftd_incurrency" jdbcType="VARCHAR" />
+    <result column="ftd_innowbalance" property="ftd_innowbalance" jdbcType="DOUBLE" />
+    <result column="ftd_rate" property="ftd_rate" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     ft_id, ft_code, ft_date, ft_status, ft_statuscode,
@@ -35,7 +40,8 @@
     ft_auditman, ft_auditdate
   </sql>
   <sql id="Detail_Column_List" >
-    ftd_bankname,ftd_inbankname,ftd_nowbalance,ftd_paymethod,ftd_paycode,ftd_remark
+    ftd_bankname,ftd_inbankname,ftd_nowbalance,ftd_paymethod,ftd_paycode,ftd_remark,ftd_currency,
+    ftd_incurrency,ftd_innowbalance,ftd_rate
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 

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

@@ -40,11 +40,13 @@
         <result column="vd_amount" property="vd_amount" jdbcType="DOUBLE" />
         <result column="vd_nowbalance" property="vd_nowbalance" jdbcType="DOUBLE" />
         <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
+        <result column="vc_rate" property="vc_rate" jdbcType="DOUBLE" />
+        <result column="vc_currency" property="vc_currency" jdbcType="VARCHAR" />
 
     </resultMap>
     <sql id="Base_Column_List">
     vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode ,vc_custcode ,vc_custid ,vc_amount1,
-    vc_status,vc_statuscode,vc_vendname,vc_custname
+    vc_status,vc_statuscode,vc_vendname,vc_custname,vc_currency,vc_rate
   </sql>
     <select id="selectVerificationListByCondition"  resultMap="BaseResultMap">
         select

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -159,6 +159,13 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     text: "转存汇率",
                     dataIndex: "ftd_rate",
                     width: 150.0
+                }, {
+                    text: "结算号",
+                    dataIndex: "ftd_paycode",
+                    width: 150,
+                    editor: {
+                        xtype: ''
+                    }
                 }, {
                     text: "结算方式",
                     width: 110.0,
@@ -194,13 +201,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                             }]
                         })
                     }
-                }, {
-                    text: "结算号",
-                    dataIndex: "ftd_paycode",
-                    width: 150,
-                    editor: {
-                        xtype: ''
-                    }
                 }, {
                     text: "备注",
                     dataIndex: "ftd_remark",

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -97,26 +97,71 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                     dataIndex: 'ftd_bankname',
                     width: 150
                 }, {
+                    text: "转出币别",
+                    dataIndex: "ftd_currency",
+                    align:'center'
+                }, {
+                    text: "转出金额(元)",
+                    xtype: 'numbercolumn',
+                    dataIndex: "ftd_nowbalance",
+                    allowBlank: false,
+                    width: 150.0,
+                    editor: {
+                        xtype: "numberfield",
+                        decimalPrecision: 2
+                    },
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 2, true);
+                    },
+                    summaryType: 'sum',
+                    summaryRenderer: function(v, d, f, m) {
+                        return saas.util.BaseUtil.numberFormat(v, 2, true);
+                    }
+                },{
                     text: '转入账户',
                     dataIndex: 'ftd_inbankname',
                     width: 150
                 }, {
-                    text: '金额(元)',
+                    text: "转入币别",
+                    dataIndex: "ftd_incurrency",
+                    align:'center'
+                }, {
+                    text: "转入金额(元)",
                     xtype: 'numbercolumn',
-                    dataIndex: 'ftd_nowbalance',
-                    width: 110,
+                    dataIndex: "ftd_innowbalance",
+                    allowBlank: false,
+                    width: 150.0,
+                    editor: {
+                        xtype: "numberfield",
+                        decimalPrecision: 2
+                    },
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                    summaryType: 'sum',
+                    summaryRenderer: function(v, d, f, m) {
+                        return saas.util.BaseUtil.numberFormat(v, 2, true);
+                    }
+                },{
+                    text: '转存汇率(%)',
+                    xtype: 'numbercolumn',
+                    dataIndex: 'ftd_rate',
+                    width: 110,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, true);
+                    },
                 }, {
+                        text: "结算号",
+                        dataIndex: "ftd_paycode",
+                        width: 150,
+                        editor: {
+                            xtype: ''
+                        }
+                },{
                     text: '结算方式',
                     dataIndex: 'ftd_paymethod',
                     width: 150
-                }, {
-                    text: '结算号',
-                    dataIndex: 'ftd_paycode',
-                    hidden: true
-                }, {
+                },  {
                     text: '审核状态',
                     dataIndex: 'ft_status',
                     align: 'center',

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -127,6 +127,18 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '币别',
+                    dataIndex: 'or_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'or_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,{
                     text: '单据状态',
                     align: 'center',
                     dataIndex: 'or_status',
@@ -166,6 +178,18 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '币别',
+                    dataIndex: 'or_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'or_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,{
                     text: '单据状态',
                     align: 'center',
                     dataIndex: 'or_status',

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -125,6 +125,18 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '币别',
+                    dataIndex: 'os_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'os_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,{
                     text: '单据状态',
                     align: 'center',
                     dataIndex: 'os_status',
@@ -165,6 +177,18 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '币别',
+                    dataIndex: 'os_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'os_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,{
                     text: '单据状态',
                     align: 'center',
                     dataIndex: 'os_status',

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -98,6 +98,18 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                     }, {
+                        text: '币别',
+                        dataIndex: 'pb_currency',
+                        width: 120
+                    } ,{
+                        text: '汇率(%)',
+                        dataIndex: 'pb_rate',
+                        xtype: 'numbercolumn',
+                        width: 120,
+                        renderer: function(v, m, r) {
+                            return saas.util.BaseUtil.numberFormat(v, 6, false);
+                        },
+                    } ,{
                         text: '付款人',
                         dataIndex: 'pb_manname',
                         width: 110
@@ -145,6 +157,18 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                } ,{
+                    text: '币别',
+                    dataIndex: 'pb_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'pb_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
                 } ,{
                     text: '结算方式',
                     dataIndex: 'pd_paymethod',

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -89,6 +89,18 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '币别',
+                    dataIndex: 'rb_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'rb_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,{
                     text: '收款人',
                     dataIndex: 'rb_manname',
                     width: 80
@@ -138,6 +150,18 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '币别',
+                    dataIndex: 'rb_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'rb_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,{
                     text: '结算方式',
                     dataIndex: 'rd_paymethod',
                     width: 120

frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -128,7 +128,19 @@ Ext.define('saas.view.money.verification.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
-                }]
+                },{
+                    text: '币别',
+                    dataIndex: 'vc_currency',
+                    width: 120
+                } ,{
+                    text: '汇率(%)',
+                    dataIndex: 'vc_rate',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    },
+                } ,]
             }
         });
         this.callParent(arguments);