Merge branch 'feature/return_money_feature' into develop

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CSH_TRANSATION.sql

@@ -37,6 +37,7 @@ set feedback on
 set define on
 
 
+
 spool off
 
 exit
\ No newline at end of file

src/main/database/Init/Sys_message/INITIALIZE_E_REPEAT_BP_CREDIT_INFO_MESSAGE.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_CREATED_BY_ERROR_MESSAGE.log
+
+set feedback off
+set define off
+
+<!--系统代码取值-->
+
+BEGIN
+  sys_message_pkg.delete_message('E_REPEAT_BP_CREDIT_INFO');
+  sys_message_pkg.insert_message('E_REPEAT_BP_CREDIT_INFO',
+                                 '错误',
+                                 '该商业伙伴已经创建！','ZHS');
+END;
+
+
+commit;
+set feedback on
+set define on
+
+
+spool off
+
+exit
\ No newline at end of file

src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview

@@ -129,6 +129,7 @@
              //根据身份判断所选择的数据是否可以确认
              var  datas = $('csh_transaction_receipt_maintain_result_ds').selected;
              if(datas.length==0){
+                 $('csh509_csh_trx_bank_refuse').enable();
                  $L.showInfoMessage("提示",'请先选择数据');
                  return;
              }
@@ -171,6 +172,7 @@
            var  datas = $('csh_transaction_receipt_maintain_result_ds').selected;
            if(datas.length==0){
                $L.showInfoMessage("提示",'请先选择数据');
+               $('csh509_csh_trx_bank_drop').enable();
                return;
            }
            var updateData=[];

src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

@@ -40,6 +40,7 @@
             var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
             if (datas.length == 0) {
                 $L.showMessage("提示", '请选择要作废的单据');
+                $('csh510_csh_trx_bank_drop').enable();
                 return;
             }
             var post_data=[];
@@ -92,6 +93,7 @@
             //获得所选择的的未提交的单据，如果有不是未提交的数据，提示重新进行选择
             if (datas.length == 0) {
                 $L.showMessage("提示", '请至少选择一条数据');
+                $('csh510_csh_trx_bank_apply_new').enable();
                 return;
             }
             var post_data=[];