Merge remote-tracking branch 'origin/remote_dev' into remote_dev

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm

@@ -37,7 +37,8 @@ begin
                                                            p_post_flag => ${@post_flag},
                                                            p_write_off_classification => ${@write_off_classification},
                                                            p_journal_date => to_date(${@journal_date},'yyyy-mm-dd'),
-                                                           p_user_id => ${/session/@user_id});
+                                                           p_user_id => ${/session/@user_id},
+                                                           p_err_msg => ${@p_err_msg});
 end;
         ]]></bm:update-sql>
         </bm:operation>
@@ -67,9 +68,13 @@ begin
                                                            p_post_flag => ${@post_flag},
                                                            p_write_off_classification => ${@write_off_classification},
                                                            p_journal_date => to_date(${@journal_date},'yyyy-mm-dd'),
-                                                           p_user_id => ${/session/@user_id});
+                                                           p_user_id => ${/session/@user_id},
+                                                           p_err_msg => ${@p_err_msg});
 end;
         ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="p_err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@p_err_msg"/>
+            </bm:parameters>
         </bm:operation>
     </bm:operations>
     <bm:fields>

src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview

@@ -529,6 +529,7 @@
         }
 
         function csh511_save_all() {
+            debugger;
             if (checkAmount()) {
                 var datas = [];
                 var para = {};
@@ -542,10 +543,21 @@
                     url: $('csh531n_submit_interface_link_id').getUrl(),
                     para: datas,
                     success: function(res) {
+                        Leaf.Masker.unmask(Ext.getBody());
+                        if(res.result.record[0].p_err_msg){
+                            var message='';
+                            for(var i=0;i<res.result.record.length;i++){
+                                message= res.result.record[i].p_err_msg + message;
+                            }
+                            var e_message = '建行代扣结果未回传 ：'+message+',请重新选择需核销的现金流!';
+                            $L.showErrorMessage("提示",e_message,null,800,300);
+                            $('csh531n_write_off_submit_btn_id').enable();
+                        }else {
                             Leaf.Masker.unmask(Ext.getBody());
                             $('csh_transaction_deposit_ds').submit();
                             $('csh_transaction_advanced_ds').submit();
                             csh531_submitsuccess();
+                        }
                     },
                     failure: function() {
                         Leaf.Masker.unmask(Ext.getBody());
@@ -693,6 +705,7 @@
             }
 
             var createConfirm = Leaf.showConfirm('提示', '确认提交复核吗', function () {
+                debugger;
                 $('csh531n_write_off_submit_btn_id').disable();
                 csh511_save_all();
             });