Merge branch 'feature/收款维护开发' into develop

src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_detail.lwm

@@ -57,6 +57,7 @@
                                   Where ctr.transaction_id = cw.csh_transaction_id
                                     and al.cashflow_id = cw.cashflow_id
                                     and cw.reversed_flag='N'
+                                    and cw.cf_item<>2
                                     and ctr.paid_byother_flag='T'),0,'F','T')        paid_byother_flag,
                           (Select v.code_value_name
                            From sys_code_values_v v
@@ -67,6 +68,7 @@
                                          Where ctr.transaction_id = cw.csh_transaction_id
                                            and al.cashflow_id = cw.cashflow_id
                                            and cw.reversed_flag='N'
+                                           and cw.cf_item<>2
                                            and ctr.paid_byother_flag='T'),0,'F','T'))                                paid_byother_flag_n,
                           (case when  al.cf_item<>'9' then cwo.received_amount else
                               al.total_amount end)received_amount,
@@ -77,6 +79,7 @@
                                Where ctr.transaction_id = cw.csh_transaction_id
                               and al.cashflow_id = cw.cashflow_id
                                  and cw.reversed_flag='N'
+                                 and cw.cf_item<>2
                               and nvl(ctr.guarantor_name_duty,'N')='Y'),0,'N','Y')  guarantor_name_duty,
                          (Select to_char(max(cw.write_off_date),'yyyy-mm-dd')
                            From csh_transaction ctr,csh_write_off cw
@@ -95,6 +98,7 @@
                              And alw.cashflow_id = cco.cashflow_id
                              and cw.reversed_flag='N'
                              and ctr.paid_byother_flag='T'
+                             and cw.cf_item<>2
                              and nvl(ctr.guarantor_name_duty,'N')='N')paid_byother_sum_flag,
                              null attachment
                       From acr_invoice_apply aa,

src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm

@@ -80,6 +80,6 @@
         <bm:query-field field="write_off_id" queryOperator="="/>
         <bm:query-field field="csh_transaction_id" queryOperator="="/>
         <bm:query-field field="reversed_flag" queryOperator="="/>
-        <bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;)))"/>
+        <bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;)))"/>
     </bm:query-fields>
 </bm:model>

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

@@ -58,20 +58,18 @@ select t.parent_company_id company_id
         <bm:query-field field="dd_bank_account_name" queryOperator="="/>
         <!--<bm:query-field name="bp_id"
                         queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>-->
-        <bm:query-field name="bp_id" queryExpression="(Exists (Select 1 From (Select h.bp_id From hls_bp_master h Where h.bp_name = (Select hbm.bp_name From hls_bp_master hbm Where hbm.bp_id = ${@bp_id})) t1 Where t1.bp_id = t.bp_id_tenant) Or Exists
-                 (Select 1
-                    From (Select h.bp_id
-                            From hls_bp_master h
-                           Where h.bp_name =
-                                 (Select hbm.bp_name
-                                    From hls_bp_master hbm
-                                   Where hbm.bp_id = ${@bp_id})) t2
-                   Where t2.bp_id = t.bp_id_agent_level1) Or Exists
-                 (Select 1
-                    From con_contract_lease_item ccli, hls_lease_item hli
-                   Where ccli.lease_item_id = hli.lease_item_id
-                     And hli.vender_id = ${@bp_id}
-                     And t.contract_id = ccli.contract_id))"/>
+        <bm:query-field name="bp_id" queryExpression="(Exists (Select 1
+                  From hls_bp_master h, hls_bp_master_role hbr
+                 Where h.bp_id = ${@bp_id}
+                   and hbr.bp_id = h.bp_id
+                   and hbr.bp_type = 'TENANT'
+                   and h.bp_id = t.bp_id_tenant) Or not Exists
+        (Select 1
+                  From hls_bp_master h, hls_bp_master_role hbr
+                 Where h.bp_id = ${@bp_id}
+                   and hbr.bp_id = h.bp_id
+                   and hbr.bp_type = 'TENANT'
+                  ))"/>
         <bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
     </bm:query-fields>
 </bm:model>

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

@@ -16,7 +16,7 @@
         <bm:field name="write_off_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="WRITE_OFF_AMOUNT" prompt="核销金额"/>
         <bm:field name="write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="WRITE_OFF_DATE" prompt="CSH_TRANSACTION_PLAN.WRITE_OFF_DATE"/>
         <bm:field name="company_id" databaseType="NUMBER" databasetype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH_TRANSACTION_PLAN.COMPANY_ID"/>
-        <bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))"/>
+        <bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))" forInsert="false" forceUpdate="false"/>
         <bm:field name="create_wf_flag"/>
     </bm:fields>
     <bm:query-fields>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm

@@ -109,6 +109,7 @@
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
         <bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
         <bm:data-filter name="query" expression="(t1.ref_contract_id is  null)"/>
+        <bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
         <bm:data-filter name="query" expression="(t1.confirmed_flag not  in('ACCAUDITING','NEW','CT_REJECTED'))"/>
         <bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
     </bm:data-filters>

src/main/webapp/modules/acr/ACR610/acr_invoice_apply_detail.lview

@@ -99,7 +99,6 @@
                 return '<a href="javascript:acr610_detail_grid_readonly(' + record.id + ',' + record.get('invoice_hd_wfl_id') + ');">' + value + '</a>';
             }
             if (name == 'attachment') {
-                if(record.get('cf_item') != '2') {
                     if (record.get('invoice_kind') == '0') {
                         if (record.get('paid_byother_flag') == 'T') {
                             if (record.get('guarantor_name_duty') != 'Y' || record.get('guarantor_name_duty') == 'NULL') {
@@ -114,7 +113,6 @@
                             }
                         }
                     }
-                }
             }
             if (name == 'received_amount') {
                 debugger;

src/main/webapp/modules/acr/ACR610/acr_invoice_apply_detail_wfl.lview

@@ -99,7 +99,6 @@
                 return '<a href="javascript:acr610_detail_grid_readonly(' + record.id + ',' + record.get('invoice_hd_wfl_id') + ');">' + value + '</a>';
             }
             if (name == 'attachment') {
-                if(record.get('cf_item') != '2') {
                     if (record.get('invoice_kind') == '0') {
                         if (record.get('paid_byother_flag') == 'T') {
                             if (record.get('guarantor_name_duty') != 'Y' || record.get('guarantor_name_duty') == 'NULL') {
@@ -114,7 +113,6 @@
                             }
                         }
                     }
-                }
             }
             if (name == 'received_amount') {
                 if ((!Leaf.isEmpty(value) && value > 0)&&record.get('cf_item') != '9') {

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

@@ -80,6 +80,12 @@
 
         function csh511_receipt_save() {
             var record=$('csh_transaction_receipt_head_ds').getAt(0);
+            if (record.get('collection_classes') == 'COMBINED') {
+                if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
+                    Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
+                    return;
+                }
+            }
             // Leaf.Masker.mask(Ext.getBody());
             // Leaf.request({
             //     url: $('csh510_update_bp_info_link').getUrl(),

src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview

@@ -55,6 +55,12 @@
                         //不将这条数据传递到数组中
                         continue;
                     }
+                    if (record.get('collection_classes') == 'COMBINED') {
+                        if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
+                            Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
+                            return;
+                        }
+                    }
                     //否则的话添加必要的字段
                     record.set('receipt_type', 'IMPORT');
                     record.set('bank_account_num', record.get('attribute_1'));

src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview

@@ -390,6 +390,8 @@
                     readOnly: readOnly,
                     interfaceQueryFlag: interfaceQueryFlag,
                     approval_flag: approval_flag,
+                    collection_classes:record.get('collection_classes'),
+                    transaction_type:transaction_type||'RECEIPT',
                     winid: 'csh_write_off_window'
                 },
                 url: $('batch_detail_link').getUrl(),

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

@@ -399,6 +399,8 @@
                     readOnly: readOnly,
                     interfaceQueryFlag: interfaceQueryFlag,
                     approval_flag: approval_flag,
+                    collection_classes:record.get('collection_classes'),
+                    transaction_type:transaction_type||'RECEIPT',
                     winid: 'csh_write_off_window'
                 },
                 url: $('batch_detail_link').getUrl(),

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -130,6 +130,10 @@
                 url = $('${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id').getUrl();
                 // Leaf.showMessage('${l:PROMPT}', '${l:HLS.CALC_TYPE_IS_NULL}');
                 //    return;
+            }
+            if (head_record.dirty == true) {
+                Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
+                return;
             }
                 if (record.dirty == true) {
                       Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
@@ -513,14 +517,20 @@
                 if (record.get('bp_category') == 'TENANT') {
                     //实际为不选中
                     Leaf.showMessage('${l:HLS.PROMPT}', '无法删除主承租人！');
-                    ds.unSelect(record);
-                    ds.Select(record);
+                    //ds.unSelect(record);
+                    //ds.select(record);
+                    setTimeout(function () {
+                        ds.unSelect(record);
+                    }, 1);
                 }
                 if (record.get('bp_category') == 'AGENT') {
                     //实际为不选中
                     Leaf.showMessage('${l:HLS.PROMPT}', '无法删除经销商！');
-                    ds.unSelect(record);
-                    ds.Select(record);
+                    // ds.unSelect(record);
+                    // ds.select(record);
+                    setTimeout(function () {
+                        ds.unSelect(record);
+                    }, 1);
                 }
             }
         };