收款退款、保证金退款优化

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_query.lwm

@@ -75,7 +75,7 @@
                           nvl(cr.left_amount, 0) as                                                  left_amount,
                           cr.finance_flag,
                           --cr.left_amount - cr.return_amount remain_amount,
-                          (nvl(ct.transaction_amount,0)-nvl(ct.write_off_amount,0)-nvl(ct.returned_amount,0)) -cr.return_amount remain_amount,
+                          nvl(cr.remain_amount,(nvl(ct.transaction_amount,0)-nvl(ct.write_off_amount,0)-nvl(ct.returned_amount,0)) -cr.return_amount) remain_amount,
                           cr.bp_bank_branch_name
                       from csh_transaction ct, csh_transaction_return cr
                       where ct.transaction_id = cr.transaction_id

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/return_workflow_start.lwm

@@ -17,7 +17,8 @@
                                                                     p_description             =>${@description},
                                                                     p_csh_return_atm_id       =>${@csh_return_atm_id},
                                                                     p_csh_return_bp_id        =>${@csh_return_bp_id},
-                                                                    p_left_amount             =>${@left_amount}
+                                                                    p_left_amount             =>${@left_amount},
+                                                                    p_remain_amount           =>${@remain_amount}
                     );
 
                 end;

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview

@@ -95,7 +95,8 @@
                             csh_return_atm_id: csh_return_atm_id,
                             csh_return_bp_id: record.get('csh_return_bp_id'),
                             return_id: return_id,
-                            left_amount: record.get('left_amount')
+                            left_amount: record.get('left_amount'),
+                            remain_amount: record.get('remain_amount')
                         },
                         success: function (res) {
                             //var return_id = res.result.return_id;