Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm

@@ -104,6 +104,7 @@
         <bm:field name="guarantor_name_duty" />
         <bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
         <bm:field name="import_source"/>
+        <bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>
         <f:standard-who/>

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_query.lwm

@@ -82,6 +82,8 @@
         <bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/>
         <bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>
         <bm:field name="transaction_wfl_id"/>
+        <bm:field name="import_source"/>
+        <bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>
         <f:standard-who/>
@@ -147,5 +149,6 @@ and cc.data_class = 'NORMAL'
 and cwo.csh_transaction_id = t1.transaction_id
 and hbm.bp_name like ${@bp_name_r})"/>
         <bm:query-field name="approval_status" queryExpression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')) = ${@approval_status}"/>
+        <bm:query-field field="import_source" queryOperator="="/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH515/get_sys_post.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: Feng  
+    $Date: 2013-9-24 下午2:19:04  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+            select t.*
+  from exp_org_position_vl t
+ WHERE t.POSITION_ID in
+       (SELECT t.POSITION_ID
+          FROM exp_employee_assigns t
+         where t.employee_id =
+              (SELECT t.employee_id FROM sys_user t where t.user_id = ${/session/@user_id}))
+       and t.position_code='012'
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

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

@@ -102,6 +102,8 @@
         <bm:field name="confirm_user_name" expression="(select description from sys_user where user_id = t1.confirmed_by)" forceUpdate="false" forInsert="false"/>
         <bm:field name="confirmed_flag_desc" expression="(select code_value_name from sys_code_values_v where code = 'CONFIRMED_FLAG' and code_value = t1.confirmed_flag)" forceUpdate="false" forInsert="false"/>
         <bm:field name="confirmed_flag"/>
+        <bm:field name="import_source"/>
+        <bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
         <!--end-->
     </bm:fields>
     <bm:features>
@@ -164,7 +166,7 @@
         <bm:query-field name="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like ${@bp_bank_account_num}"/>
         <bm:query-field name="bank_name" queryExpression="(select a.bank_short_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_name}"/>
         <bm:query-field name="bank_branch_name" queryExpression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_branch_name}"/>
-
+        <bm:query-field field="import_source" queryOperator="="/>
         <!--end-->
     </bm:query-fields>
     <bm:data-filters>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm

@@ -26,9 +26,14 @@
         </bm:operation>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            select * from ( select v1.contract_id,
-            (select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
-            (select cc.contract_name from con_contract cc where cc.contract_id=v1.contract_id)contract_name,
+           select *
+  from (select v1.contract_id,
+               (select cc.contract_number
+                  from con_contract cc
+                 where cc.contract_id = v1.contract_id) contract_number,
+               (select cc.contract_name
+                  from con_contract cc
+                 where cc.contract_id = v1.contract_id) contract_name,
                --to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
                v1.unwrite_off_amount,
                v1.deposit_trans_type,
@@ -36,8 +41,8 @@
                   from hls_bp_master t, con_contract ct
                  where t.bp_id = ct.bp_id_tenant
                    and ct.contract_id = v1.contract_id) bp_id_telnet_n,
-       (select ct.bp_id_agent_level1 from
-         con_contract ct
+               (select ct.bp_id_agent_level1
+                  from con_contract ct
                  where contract_id = v1.contract_id) bp_id_agent_level1,
                (select t.bp_name
                   from hls_bp_master t, con_contract ct
@@ -47,13 +52,31 @@
                   from sys_code_values_v v
                  where v.code = 'DEPOSIT_TRANS_TYPE'
                    and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
-          nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status,
-       v1.bp_id
-
+               nvl((hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id => v1.contract_id,
+                                                                    p_user_id     => 1)),
+                   '正常') approve_status,
+               v1.bp_id,
+               nvl((SELECT tc.trans_review_status
+                  FROM csh_transaction_contemp tc
+                 where tc.contemp_id =
+                       (select max(contemp_id)
+                          FROM csh_transaction_contemp tc
+                         where tc.source_contract_id = v1.contract_id
+                           and tc.batch_id is not null)),'NEW') trans_review_status,
+               nvl((SELECT sc.code_value_name
+                  FROM csh_transaction_contemp tc, sys_code_values_v sc
+                 where tc.contemp_id =
+                       (select max(contemp_id)
+                          FROM csh_transaction_contemp tc
+                         where tc.source_contract_id = v1.contract_id
+                           and tc.batch_id is not null)
+                   and sc.code = 'TRANS_REVIEW_STATUS'
+                   AND sc.code_value =nvl(tc.trans_review_status,'NEW')),'新建') trans_review_status_n
           from (select tt.ref_contract_id contract_id,
                        tt.deposit_trans_type,
                        sum((nvl(tt.transaction_amount, 0) -
-                   nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount,
+                           nvl(tt.write_off_amount, 0) -
+                           nvl(tt.returned_amount, 0))) unwrite_off_amount,
                        tt.bp_id
                   from csh_transaction tt
                  where tt.transaction_type = 'DEPOSIT'
@@ -61,7 +84,7 @@
                    and tt.transaction_amount > 0
                    and tt.deposit_trans_type is not null
                  group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
-          where v1.unwrite_off_amount>0)v
+         where v1.unwrite_off_amount > 0) v
                 #WHERE_CLAUSE#
                 ]]></bm:query-sql>
         </bm:operation>
@@ -71,9 +94,9 @@
     <!--</bm:data-filters>-->
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/>
+        <bm:query-field name="bp_name_n" queryExpression="v.bp_name like &apos;%&apos;||${@bp_name_n}||&apos;%&apos;"/>
         <bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/>
         <bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/>
-
+        <bm:query-field name="trans_review_status" queryExpression="v.trans_review_status =${@trans_review_status}"/>
     </bm:query-fields>
 </bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_review_execute.lwm

@@ -76,7 +76,7 @@
     </bm:operations>
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="t1.bp_name = ${@bp_name_n}"/>
+        <bm:query-field name="bp_name_n" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name_n}||&apos;%&apos;"/>
         <bm:query-field name="bp_id_telnet_n" queryExpression="t1.bp_id_telnet_n =${@bp_id_telnet_n}"/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.source_trans_type = ${@deposit_trans_type}"/>
         <bm:query-field name="trans_review_status" queryExpression="t1.trans_review_status =${@trans_review_status}"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -53,7 +53,15 @@
         <bm:field name="create_je_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CREATE_JE_FLAG"/>
         <bm:field name="gld_interface_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="GLD_INTERFACE_FLAG" prompt="CSH511.CSH_TRANSACTION.GLD_INTERFACE_FLAG"/>
         <bm:field name="bp_code" expression="(select d.bp_code from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_CODE"/>
-        <bm:field name="bp_name" expression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_NAME"/>
+        <bm:field name="bp_name" expression="(select d.bp_name
+  from hls_bp_master_v d
+ where d.bp_id = (case
+  when ( SELECT c.division
+    FROM con_contract c
+   WHERE c.contract_id =  t1.ref_contract_id) = '70' then
+    (SELECT cc.bp_id_agent_level1
+      FROM con_contract cc
+     WHERE cc.contract_id =  t1.ref_contract_id) else  t1.bp_id end))" forInsert="false" forUpdate="false" prompt="HLS.BP_NAME"/>
         <bm:field name="unit_id" expression="(select d.unit_id from hls_bp_master d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false"/>
         <bm:field name="payment_method_display" expression="(select cp.description from csh_payment_method cp where cp.payment_method_id=t1.payment_method_id)" forInsert="false" forUpdate="false" prompt="HLS.PAYMENT_METHOD"/>
         <bm:field name="currency_name" expression="(select gc.currency_name from gld_currency_vl gc where gc.currency_code=t1.currency_code)" forInsert="false" forUpdate="false" prompt="HLS.CURRENCY"/>

src/main/webapp/WEB-INF/classes/hls/HLS214N/sys_user_lv.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: WW 
+    $Date: 2014-11-13 下午5:36:09  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT t1.user_id,t1.user_name  FROM sys_user t1 #WHERE_CLAUSE#
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:query-fields>
+        <bm:query-field name="user_id" queryExpression="t1.user_id=${@user_id}"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm

@@ -72,7 +72,7 @@
     </bm:features>
     <bm:query-fields>
         <bm:query-field field="merge_parent_flag" queryOperator="="/>
-        <bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl   where hl.journal_header_id = t1.journal_header_id     and hl.reference3 = ${@contract_number})"/>
+        <bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl   where hl.journal_header_id = t1.journal_header_id     and hl.reference3 like ${@contract_number})"/>
         <bm:query-field field="journal_num" queryOperator="like"/>
         <bm:query-field name="journal_date_from" queryExpression="t1.journal_date &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/>
         <bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>

src/main/webapp/WEB-INF/classes/hsbc/HSBC100/hsbc_paying_batch_create_return.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="delete">
+            <bm:update-sql><![CDATA[
+    			delete from hl_hsbc_doc_temp t where t.session_id = ${/session/@session_id}
+    		]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="insert">
+            <bm:update-sql><![CDATA[
+            	begin
+            		hl_hsbc_interface_pkg.insert_doc_temp_return(
+            			  p_session_id=>${/session/@session_id},
+			              p_return_id=>${@return_id},
+			              p_return_transaction_id=>${@return_transaction_id},
+			              p_tranamount =>${@this_return_amount},
+			              p_user_id=>${/session/@user_id},
+				          p_button_id => ${/parameter/@button_id}
+            		);
+            	end;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+        		begin
+				  hl_hsbc_interface_pkg.create_batch_return(p_session_id => ${/session/@session_id},
+				                                       p_bank_account_id => ${@bank_account_id},
+				                                       p_user_id => ${/session/@user_id});
+				end;
+        	]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/prj/PRJ001/wh_train_project.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+            select t.project_id,
+                   t.project_number,
+                   t.amount
+            from wh_train_project_lv t
+			#WHERE_CLAUSE#]]></bm:query-sql>
+
+        <bm:operation name="execute">
+        <bm:update-sql><![CDATA[
+            begin
+                wh_train_project_pkg.project_submit(p_project_id	 =>${@project_id},,
+                									 p_user_id	 =>${/session/@user_id}
+                									 p_user_id	 =>${/session/@user_id});
+            end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:query-fields>
+        <bm:query-field name="project_id" dataType="java.lang.String" queryExpression="project_id =  ${@project_id}"/>
+        <bm:query-field name="project_number" dataType="java.lang.String" queryExpression="project_number like  &apos;%&apos;||${@project_number}||&apos;%&apos;"/>
+        <bm:query-field name="amount" dataType="java.lang.String" queryExpression="amount =  ${@amount}"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm

@@ -9,7 +9,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-SELECT * FROM (
+                      SELECT * FROM (
 SELECT h.period_year,
        h.period_num,
        h.internal_period_num,
@@ -273,7 +273,7 @@ SELECT h.period_year,
    and ga.account_code in('2221001020','2221001023')
     and h.reversed_flag='N'
     and h.internal_period_num=to_number(${@base_period})
-   AND (h.je_transaction_code= 'HL_SALES_TAX_ACT_NEW')
+   And (h.je_transaction_code ='HL_SALES_TAX_ACT_NEW' )
        and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
    union
    SELECT h.period_year,
@@ -309,6 +309,17 @@ SELECT h.period_year,
            0),2) amount_tax,
        '违约金' times,
        h.journal_date due_date,
+        case when ghd.je_template_code in('HL_RECEIVABLES_AGENT_REPUR_LB','HL_RECEIVABLES_AGENT_REPUR','HL_GLD_BALANCE_PENALTY') then
+         (select d.amount_cr
+          from hls_journal_detail d
+         where d.journal_header_id = h.journal_header_id
+           and exists
+         (select 1
+                  from gld_accounts g
+                 where g.account_id = d.account_id
+                   and g.account_code in ('6041001000'))
+           and rownum = 1)
+       else
        (select d.amount_dr
           from hls_journal_detail d
          where d.journal_header_id = h.journal_header_id
@@ -317,8 +328,20 @@ SELECT h.period_year,
                   from gld_accounts g
                  where g.account_id = d.account_id
                    and g.account_code in ('1122000001', '1122000002'))
-           and rownum = 1) due_amount,
+           and rownum = 1)
+       end due_amount,
        null principal,
+       case when ghd.je_template_code in('HL_RECEIVABLES_AGENT_REPUR_LB','HL_RECEIVABLES_AGENT_REPUR','HL_GLD_BALANCE_PENALTY') then
+         (select d.amount_cr
+          from hls_journal_detail d
+         where d.journal_header_id = h.journal_header_id
+           and exists
+         (select 1
+                  from gld_accounts g
+                 where g.account_id = d.account_id
+                   and g.account_code in ('6041001000'))
+           and rownum = 1)
+       else
        (select d.amount_dr
           from hls_journal_detail d
          where d.journal_header_id = h.journal_header_id
@@ -327,7 +350,8 @@ SELECT h.period_year,
                   from gld_accounts g
                  where g.account_id = d.account_id
                    and g.account_code in ('1122000001', '1122000002'))
-           and rownum = 1) interest,
+           and rownum = 1)
+       end interest,
        round(l.amount_cr -
        nvl((select sum(al.tax_amount)
              from acr_invoice_hd ah, acr_invoice_ln al
@@ -346,8 +370,9 @@ SELECT h.period_year,
            and cc.data_class = 'NORMAL') vat_rate,
        h.je_transaction_code,
        l.cashflow_id
-  FROM hls_journal_header h, hls_journal_detail l, gld_accounts ga
+  FROM hls_journal_header h, hls_journal_detail l, gld_accounts ga,gld_je_template_hds ghd
  WHERE h.journal_header_id = l.journal_header_id
+   and h.je_template_hd_id=ghd.je_template_hd_id
    and h.sbo_num is not null
    and h.total_amount_dr != 0
    and ga.account_id = l.account_id
@@ -356,14 +381,9 @@ SELECT h.period_year,
    and h.internal_period_num = to_number(${@base_period})
       And (h.je_transaction_code =
                                         'HL_CSH_CONSOLIDATION_DALAY' or
-                                        (h.je_transaction_code =
-                                        'CON_REPURCHASE' and exists
-                                         (select 1
-                                             from gld_je_template_hds ga
-                                            where ga.je_template_hd_id =
-                                                  h.je_template_hd_id
-                                              and ga.je_template_code =
-                                                  'HL_GLD_BALANCE_REPURCHASE')))
+                                         ghd.je_template_code in
+                                                  ('HL_GLD_BALANCE_REPURCHASE','HL_GLD_BALANCE_REPURCHASE_LB','HL_RECEIVABLES_AGENT_REPUR_LB','HL_RECEIVABLES_AGENT_REPUR','HL_GLD_BALANCE_PENALTY','HL_PENALTY_R_ET','HL_PENALTY_R_ET_LB')
+                                                  )
    and not exists (SELECT 1
           FROM acr_invoice_hd hi, acr_invoice_ln li
          WHERE hi.invoice_hd_id = li.invoice_hd_id
@@ -533,10 +553,53 @@ SELECT h.period_year,
                                                h.je_template_hd_id
                                            and hd.je_template_code in
                                                ('HL_FIN_INCOME_REPURCHASE',
-                                                'HL_FIN_INCOME_REPURCHASE_N'))
+                                                'HL_FIN_INCOME_REPURCHASE_N',
+                                                'HL_FIN_INCOME_REPURCHASE_ET',
+                                                'HL_CON_FIN_ETREPUR_INT',
+                                                'HL_CON_FIN_ETREPUR_INT_N'))
        and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
 
    union
+  SELECT h.period_year,
+       h.period_num,
+       h.internal_period_num,
+       h.journal_date,
+       h.sbo_num journal_num,
+       t.contract_number contract_number,
+       (SELECT bp.bp_code
+          FROM hls_bp_master bp,hls_journal_detail d
+         WHERE bp.bp_code = d.reference1
+         and d.journal_header_id=h.journal_header_id
+           AND ROWNUM = 1) bp_code,
+        (SELECT bp.bp_name
+          FROM hls_bp_master bp,hls_journal_detail d
+         WHERE bp.bp_code = d.reference1
+         and d.journal_header_id=h.journal_header_id
+           AND ROWNUM = 1) bp_name,
+       h.journal_header_id,
+       (SELECT hi.invoice_date
+          FROM acr_invoice_hd hi, acr_invoice_ln li
+         WHERE hi.invoice_hd_id = li.invoice_hd_id
+           AND hi.reversed_flag = 'N'
+           AND (li.cashflow_id = t.cashflow_id OR
+               li.ref_n03 = h.journal_header_id)
+           AND ROWNUM = 1) invoice_date,
+      t.un_bill_vat_principal amount_tax,
+      '解约回购本金'||t.times times,
+      h.journal_date due_date,
+      t.un_bill_principal  due_amount,
+      t.un_bill_principal principal,
+       null interest,
+      t.un_bill_vat_principal vat_due_amount,
+      t.tax_type_rate vat_rate,
+      h.je_transaction_code,
+      t.cashflow_id
+  FROM hls_journal_header h,VAT_ACCOUNT_250_PRIN_TMP t
+ WHERE h.journal_header_id = t.journal_header_id
+  and t.session_id=${/session/@session_id}
+  and nvl(t.un_bill_principal,0)>0
+  and h.internal_period_num=to_number(${@base_period})
+   union
    SELECT h.period_year,
        h.period_num,
        h.internal_period_num,
@@ -556,58 +619,19 @@ SELECT h.period_year,
            AND (li.cashflow_id = l.cashflow_id OR
                li.ref_n03 = l.journal_header_id)
            AND ROWNUM = 1) invoice_date,
-      nvl((select sum(ccc.vat_principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status!='FULL'
-       ),0) amount_tax,
-      '解约回购本金' times,
+     l.amount_cr amount_tax,
+      '留购金' times,
       h.journal_date due_date,
-      nvl((select sum(ccc.principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-       ),0)  due_amount,
-       nvl((select sum(ccc.principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-       ),0) principal,
-       null interest,
-       nvl((select sum(ccc.vat_principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status!='FULL'
-       ),0) vat_due_amount,
-        (select case when nvl(ccc.principal-ccc.vat_principal,0)!=0 then
-         round(ccc.vat_principal/(ccc.principal-ccc.vat_principal),2)
+      to_number(l.reference7)  due_amount,
+       null principal,
+      to_number(l.reference7)  interest,
+      l.amount_cr vat_due_amount,
+    case when nvl(l.reference7-abs(l.amount_cr),0)!=0 then
+         round(abs(l.amount_cr/(l.reference7-abs(l.amount_cr))),2)
       else
         null
       end
-        FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status='FULL'
-          and ccc.principal>0
-          and rownum=1
-       ) vat_rate,
+       vat_rate,
            h.je_transaction_code,
            l.cashflow_id
   FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
@@ -615,7 +639,7 @@ SELECT h.period_year,
    and h.sbo_num is not null
    and h.total_amount_dr!=0
    and ga.account_id=l.account_id
-   and l.line_description like '%本金%'
+   and l.line_description like '%留购金%'
    and ga.account_code in('2221001020','2221001023')
     and h.reversed_flag='N'
     and h.internal_period_num=to_number(${@base_period})
@@ -630,12 +654,12 @@ SELECT h.period_year,
           FROM con_contract cc,con_contract_cashflow ccc
            where cc.contract_number=l.reference3
           and cc.data_class='NORMAL'
-          and ccc.cf_item=250
 		  and cc.contract_id=ccc.contract_id
+          and ccc.cf_item=250
           and ccc.cf_status='RELEASE'
           and ccc.cf_direction='INFLOW'
           and ccc.billing_status!='FULL' )
-union
+   union
    SELECT h.period_year,
        h.period_num,
        h.internal_period_num,
@@ -655,19 +679,60 @@ union
            AND (li.cashflow_id = l.cashflow_id OR
                li.ref_n03 = l.journal_header_id)
            AND ROWNUM = 1) invoice_date,
-     l.amount_cr amount_tax,
-      '留购金' times,
-      h.journal_date due_date,
-      to_number(l.reference7)  due_amount,
-       null principal,
-      to_number(l.reference7)  interest,
-      l.amount_cr vat_due_amount,
-    case when nvl(l.reference7-abs(l.amount_cr),0)!=0 then
-         round(abs(l.amount_cr/(l.reference7-abs(l.amount_cr))),2)
+       abs(l.amount_cr)*-1
+        amount_tax,
+      (select  decode(ccc.cf_item,
+                                   8,
+                                   '留购价',
+                                   to_char(ccc.times)) from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) times,
+      (select ccc.due_date from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) due_date,
+
+   -1*  (select case
+                 when ccc.cf_item = 1 and cc.business_type = 'LEASEBACK' then
+                  nvl(ccc.interest, 0)
+                 when ccc.cf_item = 1 and cc.business_type != 'LEASEBACK' then
+                  ccc.due_amount
+                 else
+                  ccc.due_amount
+               end
+          from con_contract cc, con_contract_cashflow ccc
+         where ccc.cashflow_id = l.cashflow_id
+           and ccc.contract_id = cc.contract_id) due_amount,
+        -1* (select case
+                 when ccc.cf_item = 1 and cc.business_type = 'LEASEBACK' then
+                  0
+                 when ccc.cf_item = 1 and cc.business_type != 'LEASEBACK' then
+                 nvl(ccc.principal,0)
+
+                 else
+                  ccc.principal
+               end
+          from con_contract cc, con_contract_cashflow ccc
+         where ccc.cashflow_id = l.cashflow_id
+           and ccc.contract_id = cc.contract_id) principal,
+     -1*(select case
+                 when ccc.cf_item = 1 then
+                  nvl(ccc.interest, 0)
+
+                 else
+                  ccc.due_amount
+               end
+          from con_contract cc, con_contract_cashflow ccc
+         where ccc.cashflow_id = l.cashflow_id
+           and ccc.contract_id = cc.contract_id) interest,
+      -1*abs(l.amount_cr) vat_due_amount,
+       (select
+       case when ccc.cf_item=1 and cc.business_type='LEASEBACK' and nvl(ccc.interest-ccc.vat_interest,0) !=0  then
+          round(ccc.vat_interest/(ccc.interest-ccc.vat_interest),2)
+
+       when  ((ccc.cf_item=1 and cc.business_type!='LEASEBACK') or ccc.cf_item!=1 ) and  nvl(ccc.due_amount-ccc.vat_due_amount,0) !=0 then
+       round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
        else
          null
        end
-       vat_rate,
+       from
+       con_contract cc,con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id
+      and cc.contract_id=ccc.contract_id) vat_rate,
            h.je_transaction_code,
            l.cashflow_id
   FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
@@ -675,26 +740,14 @@ union
    and h.sbo_num is not null
    and h.total_amount_dr!=0
    and ga.account_id=l.account_id
-   and l.line_description like '%留购金%'
    and ga.account_code in('2221001020','2221001023')
    and h.reversed_flag='N'
-    and h.internal_period_num=to_number(${@base_period})
-    And exists (selEct 1
-                                              from gld_je_template_hds hd
-                                             where hd.je_template_hd_id =
-                                                   h.je_template_hd_id
-                                               and hd.je_template_code in
-                                                   ('HL_CON_CHANGE_REPURCHASE_VAT'))
-
-   AND   EXISTS (SELECT 1
-          FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-		  and cc.contract_id=ccc.contract_id
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status!='FULL' )
+   and h.internal_period_num = to_number(${@base_period})
+   and exists(select 1 from gld_je_template_hds hd
+where hd.je_template_hd_id=h.je_template_hd_id
+and hd.je_template_code in
+('HL_CON_VAT_REVERSE_REPURCHASE','HL_VAT_REVERSE_REPURCHASE_LB','HL_CON_VAT_REVERSE_ET','HL_CON_VAT_REVERSE_ET_LB','HL_REPURCHASE_VAT_REVERSE')
+)
 
  ) t1
         #WHERE_CLAUSE#

src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm

@@ -80,7 +80,6 @@ SELECT h.period_year,
                                                    h.je_template_hd_id
                                                and hd.je_template_code =
                                                    'HL_INCEPT_DOWN_PAYMENT_CF')
-       and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
    AND  not EXISTS (SELECT 1
           FROM acr_invoice_hd hi, acr_invoice_ln li
          WHERE hi.invoice_hd_id = li.invoice_hd_id
@@ -338,6 +337,17 @@ SELECT h.period_year,
            0),2) amount_tax,
        '违约金' times,
        h.journal_date due_date,
+       case when ghd.je_template_code in('HL_RECEIVABLES_AGENT_REPUR_LB','HL_RECEIVABLES_AGENT_REPUR','HL_GLD_BALANCE_PENALTY') then
+         (select d.amount_cr
+          from hls_journal_detail d
+         where d.journal_header_id = h.journal_header_id
+           and exists
+         (select 1
+                  from gld_accounts g
+                 where g.account_id = d.account_id
+                   and g.account_code in ('6041001000'))
+           and rownum = 1)
+       else
        (select d.amount_dr
           from hls_journal_detail d
          where d.journal_header_id = h.journal_header_id
@@ -346,8 +356,20 @@ SELECT h.period_year,
                   from gld_accounts g
                  where g.account_id = d.account_id
                    and g.account_code in ('1122000001', '1122000002'))
-           and rownum = 1) due_amount,
+           and rownum = 1)
+       end due_amount,
        null principal,
+       case when ghd.je_template_code in('HL_RECEIVABLES_AGENT_REPUR_LB','HL_RECEIVABLES_AGENT_REPUR','HL_GLD_BALANCE_PENALTY') then
+         (select d.amount_cr
+          from hls_journal_detail d
+         where d.journal_header_id = h.journal_header_id
+           and exists
+         (select 1
+                  from gld_accounts g
+                 where g.account_id = d.account_id
+                   and g.account_code in ('6041001000'))
+           and rownum = 1)
+       else
        (select d.amount_dr
           from hls_journal_detail d
          where d.journal_header_id = h.journal_header_id
@@ -356,7 +378,8 @@ SELECT h.period_year,
                   from gld_accounts g
                  where g.account_id = d.account_id
                    and g.account_code in ('1122000001', '1122000002'))
-           and rownum = 1) interest,
+           and rownum = 1)
+       end interest,
        round(l.amount_cr -
        nvl((select sum(al.tax_amount)
              from acr_invoice_hd ah, acr_invoice_ln al
@@ -376,8 +399,9 @@ SELECT h.period_year,
        h.je_transaction_code,
        l.cashflow_id,
        'N' fixed_data_flag
-  FROM hls_journal_header h, hls_journal_detail l, gld_accounts ga
+  FROM hls_journal_header h, hls_journal_detail l, gld_accounts ga,gld_je_template_hds ghd
  WHERE h.journal_header_id = l.journal_header_id
+   and h.je_template_hd_id=ghd.je_template_hd_id
    and h.sbo_num is not null
    and h.total_amount_dr != 0
    and ga.account_id = l.account_id
@@ -386,14 +410,9 @@ SELECT h.period_year,
    and h.internal_period_num < to_number(${@base_period})
       And (h.je_transaction_code =
                                         'HL_CSH_CONSOLIDATION_DALAY' or
-                                        (h.je_transaction_code =
-                                        'CON_REPURCHASE' and exists
-                                         (select 1
-                                             from gld_je_template_hds ga
-                                            where ga.je_template_hd_id =
-                                                  h.je_template_hd_id
-                                              and ga.je_template_code =
-                                                  'HL_GLD_BALANCE_REPURCHASE')))
+                                         ghd.je_template_code in
+                                                  ('HL_GLD_BALANCE_REPURCHASE','HL_GLD_BALANCE_REPURCHASE_LB','HL_RECEIVABLES_AGENT_REPUR_LB','HL_RECEIVABLES_AGENT_REPUR','HL_GLD_BALANCE_PENALTY','HL_PENALTY_R_ET','HL_PENALTY_R_ET_LB')
+                                                  )
    and ((trunc(h.journal_date) <=
        trunc(to_date('2020-01-31', 'yyyy-mm-dd')) and
        h.description = 'MANUAL_IMPORT') or
@@ -404,7 +423,7 @@ SELECT h.period_year,
          WHERE hi.invoice_hd_id = li.invoice_hd_id
            AND hi.vat_interface_status = 'BACK'
            and hi.invoice_status = 'CONFIRM'
-           AND to_char(hi.invoice_date, 'yyyymm') <= ${@base_period}
+           AND to_char(hi.invoice_date, 'yyyymm') < =${@base_period}
            and li.ref_n03 = l.journal_header_id
            and li.ref_n04 = l.journal_line_id)
   union
@@ -581,7 +600,10 @@ SELECT h.period_year,
                                                h.je_template_hd_id
                                            and hd.je_template_code in
                                                ('HL_FIN_INCOME_REPURCHASE',
-                                                'HL_FIN_INCOME_REPURCHASE_N'))
+                                                'HL_FIN_INCOME_REPURCHASE_N',
+                                                'HL_FIN_INCOME_REPURCHASE_ET',
+                                                'HL_CON_FIN_ETREPUR_INT',
+                                                'HL_CON_FIN_ETREPUR_INT_N'))
        and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
    AND    not EXISTS (SELECT 1
           FROM acr_invoice_hd hi, acr_invoice_ln li
@@ -597,100 +619,41 @@ SELECT h.period_year,
               h.internal_period_num,
               h.journal_date,
               h.sbo_num journal_num,
-       reference3 contract_number,
-       reference1 bp_code,
-       (SELECT BP_NAME
-          FROM hls_bp_master
-         WHERE bp_code = reference1
+              t.contract_number,
+              (SELECT bp.bp_code
+                 FROM hls_bp_master bp, hls_journal_detail d
+                WHERE bp.bp_code = d.reference1
+                  and d.journal_header_id = h.journal_header_id
+                  AND ROWNUM = 1) bp_code,
+              (SELECT bp.bp_name
+                 FROM hls_bp_master bp, hls_journal_detail d
+                WHERE bp.bp_code = d.reference1
+                  and d.journal_header_id = h.journal_header_id
                   AND ROWNUM = 1) bp_name,
-       l.journal_header_id,
+              h.journal_header_id,
               (SELECT hi.invoice_date
                  FROM acr_invoice_hd hi, acr_invoice_ln li
                 WHERE hi.invoice_hd_id = li.invoice_hd_id
                   AND hi.reversed_flag = 'N'
-           AND (li.cashflow_id = l.cashflow_id OR
-               li.ref_n03 = l.journal_header_id)
+                  AND (li.cashflow_id = t.cashflow_id OR
+                      li.ref_n03 = h.journal_header_id)
                   AND ROWNUM = 1) invoice_date,
-         nvl((select sum(ccc.vat_principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status!='FULL'
-       ),0) amount_tax,
-      '解约回购本金' times,
+              t.un_bill_vat_principal amount_tax,
+              '解约回购本金' || t.times times,
               h.journal_date due_date,
-      nvl((select sum(ccc.principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-       ),0)  due_amount,
-       nvl((select sum(ccc.principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-       ),0) principal,
+              t.un_bill_principal due_amount,
+              t.un_bill_principal principal,
               null interest,
-       nvl((select sum(ccc.vat_principal) FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-          and ccc.contract_id=cc.contract_id
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status!='FULL'
-       ),0) vat_due_amount,
-        (select case when nvl(ccc.principal-ccc.vat_principal,0)!=0 then
-         round(ccc.vat_principal/(ccc.principal-ccc.vat_principal),2)
-        else
-          null
-        end
-        FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status='FULL'
-          and ccc.principal>0
-          and rownum=1
-       ) vat_rate,
+              t.un_bill_vat_principal vat_due_amount,
+              t.tax_type_rate vat_rate,
               h.je_transaction_code,
-           l.cashflow_id,
+              t.cashflow_id,
               'N' fixed_data_flag
-  FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
- WHERE h.journal_header_id = l.journal_header_id
-   and h.sbo_num is not null
-   and h.total_amount_dr!=0
-   and ga.account_id=l.account_id
-   and l.line_description like '%本金%'
-   and ga.account_code in('2221001020','2221001023')
-    and h.reversed_flag='N'
-    and h.internal_period_num<to_number(${@base_period})
-    And exists (selEct 1
-                                              from gld_je_template_hds hd
-                                             where hd.je_template_hd_id =
-                                                   h.je_template_hd_id
-                                               and hd.je_template_code in
-                                                   ('HL_CON_CHANGE_REPURCHASE_VAT'))
-
-   AND   EXISTS (SELECT 1
-          FROM con_contract cc,con_contract_cashflow ccc
-           where cc.contract_number=l.reference3
-          and cc.data_class='NORMAL'
-          and ccc.cf_item=250
-		  and cc.contract_id=ccc.contract_id
-          and ccc.cf_status='RELEASE'
-          and ccc.cf_direction='INFLOW'
-          and ccc.billing_status!='FULL' )
+         FROM hls_journal_header h, VAT_ACCOUNT_250_PRIN_TMP t
+        WHERE h.journal_header_id = t.journal_header_id
+          and t.session_id=${/session/@session_id}
+          and nvl(t.un_bill_principal,0)>0
+          and h.internal_period_num < to_number(${@base_period})
 	union
 	   SELECT h.period_year,
        h.period_num,
@@ -775,6 +738,95 @@ SELECT h.period_year,
       null cashflow_id,
       'Y' fixed_data_flag
     from hl_cm_rpt555_fixed_data  h
+    union
+    SELECT h.period_year,
+       h.period_num,
+       h.internal_period_num,
+       h.journal_date,
+       h.sbo_num journal_num,
+       reference3 contract_number,
+       reference1 bp_code,
+       (SELECT BP_NAME
+          FROM hls_bp_master
+         WHERE bp_code = reference1
+           AND ROWNUM = 1) bp_name,
+       l.journal_header_id,
+       (SELECT hi.invoice_date
+          FROM acr_invoice_hd hi, acr_invoice_ln li
+         WHERE hi.invoice_hd_id = li.invoice_hd_id
+           AND hi.reversed_flag = 'N'
+           AND (li.cashflow_id = l.cashflow_id OR
+               li.ref_n03 = l.journal_header_id)
+           AND ROWNUM = 1) invoice_date,
+       -1*abs(l.amount_cr) amount_tax,
+      (select  decode(ccc.cf_item,
+                                   8,
+                                   '留购价',
+                                   to_char(ccc.times)) from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) times,
+      (select ccc.due_date from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) due_date,
+
+     -1*  (select case
+                 when ccc.cf_item = 1 and cc.business_type = 'LEASEBACK' then
+                  nvl(ccc.interest, 0)
+                 when ccc.cf_item = 1 and cc.business_type != 'LEASEBACK' then
+                  ccc.due_amount
+                 else
+                  ccc.due_amount
+               end
+          from con_contract cc, con_contract_cashflow ccc
+         where ccc.cashflow_id = l.cashflow_id
+           and ccc.contract_id = cc.contract_id) due_amount,
+        -1* (select case
+                 when ccc.cf_item = 1 and cc.business_type = 'LEASEBACK' then
+                  0
+                 when ccc.cf_item = 1 and cc.business_type != 'LEASEBACK' then
+                 nvl(ccc.principal,0)
+
+                 else
+                  ccc.principal
+               end
+          from con_contract cc, con_contract_cashflow ccc
+         where ccc.cashflow_id = l.cashflow_id
+           and ccc.contract_id = cc.contract_id) principal,
+       -1*(select case
+                 when ccc.cf_item = 1 then
+                  nvl(ccc.interest, 0)
+
+                 else
+                  ccc.due_amount
+               end
+          from con_contract cc, con_contract_cashflow ccc
+         where ccc.cashflow_id = l.cashflow_id
+           and ccc.contract_id = cc.contract_id) interest,
+      -1*abs(l.amount_cr) vat_due_amount,
+       (select
+       case when ccc.cf_item=1 and cc.business_type='LEASEBACK' and nvl(ccc.interest-ccc.vat_interest,0) !=0  then
+          round(ccc.vat_interest/(ccc.interest-ccc.vat_interest),2)
+
+       when  ((ccc.cf_item=1 and cc.business_type!='LEASEBACK') or ccc.cf_item!=1 ) and  nvl(ccc.due_amount-ccc.vat_due_amount,0) !=0 then
+       round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
+       else
+         null
+       end
+       from
+       con_contract cc,con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id
+      and cc.contract_id=ccc.contract_id) vat_rate,
+           h.je_transaction_code,
+           l.cashflow_id,
+      'Y' fixed_data_flag
+  FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
+ WHERE h.journal_header_id = l.journal_header_id
+   and h.sbo_num is not null
+   and h.total_amount_dr!=0
+   and ga.account_id=l.account_id
+   and ga.account_code in('2221001020','2221001023')
+   and h.reversed_flag='N'
+   and h.internal_period_num <to_number(${@base_period})
+   and exists(select 1 from gld_je_template_hds hd
+where hd.je_template_hd_id=h.je_template_hd_id
+and hd.je_template_code in
+('HL_CON_VAT_REVERSE_REPURCHASE','HL_VAT_REVERSE_REPURCHASE_LB','HL_CON_VAT_REVERSE_ET','HL_CON_VAT_REVERSE_ET_LB','HL_REPURCHASE_VAT_REVERSE')
+)
  ) t1
         #WHERE_CLAUSE#
    ]]></bm:query-sql>

src/main/webapp/WEB-INF/classes/sys/sys_page_menu.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: DJ
+    $Date: 2013-4-14 下午02:19:46
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT
+                    v.function_id,
+                    v.function_code,
+                    v.function_name,
+                    v.menu_id,
+                    v.parent_menu_id,
+                    case when v.menu_type = 'MENU' then
+                    (case   when (select count(*) from sys_role_module_home_page srmw where srmw.function_group_id = v.function_id and srmw.role_id = v.role_id and srmw.subject = ${/session/@subject}) > 0 then 'role_module'
+                            when (select count(*) from sys_module_home_page smhp where smhp.function_group_id = v.function_id and smhp.subject = ${/session/@subject}) > 0 then 'module'
+                            else 'none' end
+                    )else 'none' end module_flag,
+                    (select nvl(sum(1),0) from sys_role_menu_v v1 where v1.parent_menu_id=v.menu_id) sub_menu_count
+                FROM
+                    sys_role_menu_v v #WHERE_CLAUSE#
+                ORDER BY
+                    v.layout_sequence
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:data-filters>
+        <bm:data-filter enforceOperations="query" expression="v.role_id=${/session/@role_id}"/>
+        <bm:data-filter enforceOperations="query" expression="((not exists (select 1 from sys_role_user_function f where f.role_id = v.role_id and f.function_id = v.function_id)) or (exists  (select 1 from sys_role_user_function f where f.role_id = v.role_id and f.user_id = ${/session/@user_id} and f.function_id = v.function_id)))"/>
+        <!--<bm:data-filter enforceOperations="query" expression="((v.function_code != 'CON3200') or(v.function_code = 'CON3200' AND ((v.role_code not in ('0018', '0019')) or  (v.role_code in ('0018', '0019') and exists  (select 1  from sys_user u, sys_user_role_groups r  where u.user_id = r.user_id  and r.role_id = v.role_id  AND u.user_id = ${/session/@user_id}  and u.user_name in ('MJ001', 'MJ002'))))))"/>
+    -->
+    </bm:data-filters>
+</bm:model>

src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_users_v_lov.lwm

@@ -13,6 +13,7 @@
         <ns1:field name="employee_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" prompt="用户姓名"/>
         <ns1:field name="email" forDisplay="true" prompt="邮箱"/>
         <ns1:field name="mobil" forDisplay="true" prompt="号码"/>
+        <ns1:field name="role_admin_amount" expression="(select count(1) from SYS_USER_ROLE_GROUPS_VL t where t.enabled_flag = &apos;Y&apos; and t.role_code in (&apos;0017&apos;,&apos;HAND&apos;) and t.user_id = t1.user_id and t.role_id = ${/session/@role_id})"/>
     </ns1:fields>
     <ns1:query-fields>
         <ns1:query-field field="user_name" queryOperator="like"/>

src/main/webapp/WEB-INF/server-script/layoutconfig/contract_ifrs9_g_contract_result_queryfields.js

-// var override_queryfields = [
-// 	{
-// 		name : 'period_name',
-// 		queryexpression : "t1.period_name =${@period_name}"
-// 	}]
+/*
+ var override_queryfields = [
+	 {in (${@division})
+		 name : 'lease_name',
+		 queryexpression : 't1.division in (${@lease_name})'
+	 }]
+*/
 
 var add_datafilters = [ {
-	name : 'period_name',
-	expression : 't1.period_name=${@period_name}'
-} ];
+	name : 'period_names',
+	expression : 't1.period_name=${@period_names}'
+},
+	{
+		name : 'divisions',
+		expression : 't1.division in (${@division1},${@division2},${@division3},${@division4},${@division5},${@division6},${@division7},${@division8},{@division9}) '
+	}
+];
 
 add_datafilter();
-// override();
+//override();
\ No newline at end of file

src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js

+var override_queryfields = [
+	{
+		name : 'payment_req_number',
+		queryexpression : "transaction_num = ${@payment_req_number}"
+	},
+	{
+		name : 'approval_date_from',
+		queryexpression : "trunc(t1.approval_date) >= to_date(${@approval_date_from},'yyyy-mm-dd')"
+	},
+	{
+		name : 'approval_date_to',
+		queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
+	}
+];
+
+
+override();

src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_g_result_queryfields.js

@@ -12,7 +12,7 @@
 var add_datafilters = [
     {
         name : 'init_filter',
-        expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR')"
+        expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.cf_item = '0'"
     }
 ];
 

src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_r_result_queryfields.js

+var override_queryfields = [
+    {
+        name : 'creationdate_from',
+        queryexpression : "trunc(t1.creationdate) >= to_date(${@creationdate_from},'yyyy-mm-dd')"
+    },
+    {
+        name : 'creationdate_to',
+        queryexpression : "trunc(t1.creationdate) <= to_date(${@creationdate_to},'yyyy-mm-dd')"
+    }
+];
+
+var add_datafilters = [
+    {
+        name : 'init_filter',
+        expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.collection_classes = 'REFUND'"
+    }
+];
+
+
+add_datafilter();
+override();

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -153,6 +153,12 @@
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'none';
                 }
+                if('${/parameter/@layout_code}' == "CONTRACT_CREATE_INC" && record.get('division') == '70'){
+                    if(Ext.isEmpty(record.get('guarantee_letter_f'))){
+                        record.set('guarantee_letter_f','N');
+                        record.set('guarantee_letter_f_n','否');
+                    }
+                }
             }
 
         };
@@ -711,7 +717,6 @@
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
             if(ds.id == lease_item_ds_id&&lease_item_ds_id){
-                debugger;
                 var gridId= ds.bindname+'_layout_grid_id';
                 if(record.data.division=='70'){
                     $(gridId).hideColumn('full_name');
@@ -753,6 +758,7 @@
             }
         };
 
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -452,6 +452,7 @@
             debugger;
             var ds_id_req = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
             if (ds_id_req == ds.id && ds_id_req) {
+                if(record.get('document_type')=='REPUR_CHAG'|| record.get('document_type')=='ET_CHAG'){
                     if (record.get('ccr_penalty') != record.get('penalty')) {
                         var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_CCR_PENALTY');
                         var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
@@ -474,12 +475,27 @@
                     }
                     ;
                     //调整后留购价
-                var residual_value = record.get('residual_value')
+                    var residual_value = record.get('residual_value');
+                    var ccr_residual_value = record.get('ccr_residual_value');
+                    var amount_250 = record.get('amount_250');
+
+                    if (amount_250 == 0){
+                        if (residual_value != ccr_residual_value && typeof (residual_value) != 'undefined') {
+                            var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
+                            var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
+                            req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
+                        }
+
+                    }
+                    if(amount_250 != 0){
                         if (residual_value != 0 && typeof (residual_value) != 'undefined') {
                             var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
                             var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
                             req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
-                };
+                        }
+                    }
+
+                }
             }
         };
 

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -387,7 +387,7 @@
                     },
                     success: function (res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                        if (res.result.record.submitted_flag == 'Y') {
+                        if (res.result.record.submitted_flag == 'Y' && '${/parameter/@source_type}' != 'WFL_Y') {
                             Leaf.showMessage('${l:PROMPT}', '该单据已经提交');
                             check_flag = false;
                         } else {

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

@@ -594,6 +594,7 @@
 
         ]]></script>
         <a:dataSets>
+            <a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
             <a:dataSet id="position_code_ds">
                 <a:datas dataSource="/model/position_code"/>
             </a:dataSet>
@@ -818,7 +819,7 @@
                             <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
                         </a:mapping>
                     </a:field>
-
+                    <a:field name="import_source_desc"  options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="csh510_receipt_maintain_update"/>
@@ -894,6 +895,8 @@
                         <!--                        <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>-->
                         <a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                     prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
+                        <a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="新增路径"/>
+
                     </a:fieldSet>
 
 
@@ -928,7 +931,7 @@
 
                         <a:column name="guarantor_name_duty"  hidden="true" />
                         <a:column name="paid_byother_flag" hidden="true"/>
-
+                        <a:column name="import_source_desc"   prompt="新增路径" align="center"/>
                         <a:column name="confirmed_flag_desc" prompt="单据审批状态"
                                   align="center"/>
                         <!--                        <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"-->

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

@@ -128,7 +128,7 @@
 
         function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
             if (name == 'bp_id') {
-                if (value != oldvalue) {
+                if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD') {
                     record.set('bp_bank_account_id', '');
                     record.set('bp_bank_account_code', '');
                     record.set('bp_bank_account_name', '');
@@ -839,5 +839,20 @@
 
 
         </a:screenBody>
+        <script type="text/javascript"><![CDATA[
+        Leaf.onReady(init);
+
+        function init() {
+            if('${/parameter/@import_source}' == 'HSBC_ADD'){
+                var record = $('csh_transaction_receipt_head_ds').getAt(0);
+                record.getField('transaction_date').setReadOnly(true);
+                record.getField('transaction_amount').setReadOnly(true);
+                record.getField('bank_slip_num').setReadOnly(true);
+                record.getField('ref_v05').setReadOnly(true);
+                record.getField('bank_account_name').setReadOnly(true);
+                record.getField('bp_bank_account_name').setReadOnly(true);
+            }
+        }
+        ]]></script>
     </a:view>
 </a:screen>

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

@@ -253,7 +253,7 @@
                     return value;
                 }*/
                 if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){
-                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true';
+                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source');
                 }else{
                     url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
                 }

src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse.lview

@@ -147,6 +147,7 @@
 
         ]]></script>
         <a:dataSets>
+            <a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
             <a:dataSet id="currency_ds">
                 <a:datas dataSource="/model/currency"/>
             </a:dataSet>
@@ -241,6 +242,7 @@
                         </a:mapping>
                     </a:field>
                     <a:field name="approval_status_desc" displayField="code_value_name" options="approval_status_ds" returnField="approval_status" valueField="code_value"/>
+                    <a:field name="import_source_desc"  options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="csh514_reversed_update"/>
@@ -317,6 +319,7 @@
                              prompt="合同编号"/>
                 <a:comboBox name="approval_status_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds"
                             prompt="审批状态"/>
+                <a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds" prompt="新增路径"/>
             </a:form>
             <a:grid id="csh_transaction_receipt_write_off_grid_ds"
                     bindTarget="csh_transaction_receipt_write_off_reverse_result_ds" marginHeight="260" marginWidth="35"
@@ -350,6 +353,7 @@
                     <a:column name="bank_account_name" width="120"/>
                     <a:column name="transaction_type_desc" align="center" prompt="事务类型" width="120"/>
                     <a:column name="receipt_type_des" align="center" prompt="收款类型" width="120"/>
+                    <a:column name="import_source_desc"   prompt="新增路径" align="center"/>
                     <a:column name="approval_status_desc" align="center" prompt="审批状态" width="120"/>
                 </a:columns>
                 <a:editors>

src/main/webapp/modules/csh/CSH515/csh_amount_return.lview

@@ -8,6 +8,7 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
     <a:init-procedure>
         <a:model-query fetchAll="true" model="csh.CSH560.get_fin_amount" rootPath="fin_amount_check"/>
+        <a:model-query model="csh.CSH515.get_sys_post" rootPath="post_info"/>
     </a:init-procedure>
     <a:view>
         <a:link id="csh560_start_wfl_link" model="csh.CSH560.return_workflow_start" modelaction="execute"/>
@@ -37,16 +38,30 @@
         //   // window.open(url, '_self');
         // }
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
-
          /*   var transaction_amount = ${/parameter/@transaction_amount}||0;
             var return_amount = ${/parameter/@returned_amount}||0;
             var write_off_amount = ${/parameter/@write_off_amount}||0;
             var remain_total_amount = ${/parameter/@remain_total_amount}||0;
             var bank_slip_num = '${/parameter/@bank_slip_num}';*/
 
-            record.set('remain_total_amount',remain_total_amount);
-            record.set('bank_slip_num',bank_slip_num);
+            // record.set('remain_total_amount',remain_total_amount);
+            // record.set('bank_slip_num',bank_slip_num);
+            if("${/model/post_info/record/@position_code}"!="012") {
+                document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG_prompt").style.display = "none";
+                document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG").style.display = "none";
+            }
+
         };
+        //保存前调用
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var band_na = $(ds_id).getAt(0).get('opposite_band_na');
+            var bank_branch_name = $(ds_id).getAt(0).get('bp_bank_branch_name');
+            if(bank_branch_name.indexOf(band_na)==-1){
+                Leaf.showMessage('提示', '请填写支行全称(例如：上海浦东发展银行外高桥保税区支行)');
+                return false;
+            }
+        }
         //提交按钮
     window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
         var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
@@ -58,11 +73,17 @@
         var return_amount = $(ds_id).getAt(0).get('return_amount');
         var write_off_amount = $(ds_id).getAt(0).get('write_off_amount');
         var remain_total_amount = $(ds_id).getAt(0).get('remain_total_amount');
+        var band_na = $(ds_id).getAt(0).get('opposite_band_na');
+        var bank_branch_name = $(ds_id).getAt(0).get('bp_bank_branch_name');
 //        var check_amount = parseFloat(transaction_amount) - parseFloat(this_return_amount) - parseFloat(return_amount) - parseFloat(write_off_amount);
         if (!return_id) {
             Leaf.showMessage('提示', '请先保存再提交');
             return;
         }
+        if(bank_branch_name.indexOf(band_na)==-1){
+            Leaf.showMessage('提示', '请填写支行全称(例如：上海浦东发展银行外高桥保税区支行)');
+            return;
+        }
         if(this_return_amount >  parseFloat(remain_total_amount)){
             Leaf.showMessage('提示', '退款金额不能大于可退款金额！');
             return;
@@ -73,7 +94,7 @@
 		    // return;
 		// }
 
-        $L.showConfirm("提示",'确认提交审批？',function(){
+        $L.showConfirm("提示",'确认提交审批？</br>【注意】“退款对方账户银行及分行”需填写完整的银行及分行全称，请检查填写是否正确！',function(){
             var detail_mask = $('${/parameter/@winid}').wrap;
             Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
             Leaf.request({
@@ -128,14 +149,18 @@
         //更新时调用
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
             var return_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
-
             if (return_ds == ds.id) {
-                if (name == 'return_bp_type' && value == 'OTHER') {
-                    record.getField('return_bp_code').setRequired(true);
-                    record.getField('bp_bank_account_name').setReadOnly(false);
-                }else if(name == 'return_bp_type' && value != 'OTHER'){
-                    record.getField('return_bp_code').setRequired(false);
+                if (name == 'return_bp_type' && value == 'THIRD_PARTY') {
+                    record.getField('bp_bank_account_num').setReadOnly(true);
+                    record.getField('bp_bank_account_name').setReadOnly(true);
+                    record.getField('opposite_band_na').setReadOnly(true);
+                    record.getField('bp_bank_branch_name').setReadOnly(true);
+                }
+                if (name == 'return_bp_type' && (value == 'AGENT'||value == 'TENANT')){
+                    record.getField('bp_bank_account_num').setReadOnly(false);
                     record.getField('bp_bank_account_name').setReadOnly(true);
+                    record.getField('opposite_band_na').setReadOnly(false);
+                    record.getField('bp_bank_branch_name').setReadOnly(false);
                 }
             }
         };

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

@@ -509,6 +509,7 @@
 
         ]]></script>
         <a:dataSets>
+            <a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
             <a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
             <a:dataSet id="confirmed_flag_ds">
                 <a:datas>
@@ -555,6 +556,7 @@
                     <a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/>
                     <a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
                              defaultValue="code_value_name" returnField="receipt_type"/>
+                    <a:field name="import_source_desc"  options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="csh513_receipt_write_off_update"/>
@@ -630,6 +632,9 @@
                         <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
                                     prompt="单据审批状态"/>
                     </a:box>
+                    <a:box column="4">
+                        <a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
+                    </a:box>
                 </a:fieldSet>
             </a:form>
             <a:grid id="csh_transaction_receipt_write_off_grid_ds"
@@ -673,6 +678,7 @@
                     <!--                              renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
                     <!--                    <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
                     <a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
+                    <a:column name="import_source_desc"   prompt="新增路径" align="center"/>
                     <a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
                     <!--                    <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
                     <!--                    <a:column name="ref_v05" prompt="备注" width="100"/>-->

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

@@ -518,6 +518,7 @@
 
         ]]></script>
         <a:dataSets>
+            <a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
             <a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
             <a:dataSet id="confirmed_flag_ds">
                 <a:datas>
@@ -565,6 +566,7 @@
                     <a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/>
                     <a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
                              defaultValue="code_value_name" returnField="receipt_type"/>
+                    <a:field name="import_source_desc"  options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="csh513_receipt_write_off_update"/>
@@ -642,6 +644,9 @@
                         <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
                                     prompt="单据审批状态"/>
                     </a:box>
+                    <a:box column="4">
+                        <a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
+                    </a:box>
                 </a:fieldSet>
             </a:form>
             <a:grid id="csh_transaction_receipt_write_off_grid_ds"
@@ -685,6 +690,7 @@
                     <!--                              renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
                     <!--                    <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
                     <a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
+                    <a:column name="import_source_desc"   prompt="新增路径" align="center"/>
                     <a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
                     <!--                    <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
                     <!--                    <a:column name="ref_v05" prompt="备注" width="100"/>-->

src/main/webapp/modules/csh/CSH560/vender_deposit_return.lview

@@ -8,6 +8,7 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
     <a:init-procedure>
         <a:model-query fetchAll="true" model="csh.CSH560.get_fin_amount" rootPath="fin_amount_check"/>
+        <a:model-query model="csh.CSH515.get_sys_post" rootPath="post_info"/>
     </a:init-procedure>
     <a:view>
         <a:link id="csh560_start_wfl_link" model="csh.CSH560.return_workflow_start" modelaction="execute"/>
@@ -18,12 +19,56 @@
         <a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
         <script type="text/javascript"><![CDATA[
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
-
             var transaction_amount = record.get('transaction_amount') || 0;
             var return_amount = record.get('return_amount') || 0;
             var write_off_amount = record.get('write_off_amount') || 0;
             var deposit_total_amount = parseFloat(transaction_amount - write_off_amount - return_amount).toFixed(2);
             record.set('deposit_total_amount', deposit_total_amount);
+            //调整后不为默认值高亮显示
+            if (record.get('bp_bank_branch_name') != record.get('bp_bank_branch_name_n')){
+               // 获取对应字段div的id
+                var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_FORM_CSH_TRANSACTION_RETURN_BP_BANK_BRANCH_NAME');
+             //   获取当前div下所有input组件
+                var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
+             //   设定第一个input组件background的color
+                req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
+            };
+            if (record.get('bp_bank_account_num') != record.get('bp_bank_account_num_n')){
+                // 获取对应字段div的id
+                var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_FORM_CSH_TRANSACTION_RETURN_BP_BANK_ACCOUNT_NUM');
+                //   获取当前div下所有input组件
+                var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
+                //   设定第一个input组件background的color
+                req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
+            };
+            if (record.get('opposite_band_na') != record.get('opposite_band_na_n')){
+                // 获取对应字段div的id
+                var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_FORM_CSH_TRANSACTION_RETURN_OPPOSITE_BAND_NA');
+                //   获取当前div下所有input组件
+                var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
+                //   设定第一个input组件background的color
+                req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
+            };
+            if("${/model/post_info/record/@position_code}"!="012") {
+                document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG_prompt").style.display = "none";
+                document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG").style.display = "none";
+           }
+            if("${/model/post_info/record/@position_code}"=="012") {
+                record.getField('this_return_amount').setReadOnly(true);
+                record.getField('return_date').setReadOnly(true);
+                record.getField('bp_bank_branch_name').setReadOnly(true);
+                record.getField('notes').setReadOnly(true);
+                record.getField('return_bp_type').setReadOnly(true);
+                record.getField('return_bp_type_n').setReadOnly(true);
+            }
+            var return_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            if (return_ds == ds.id) {
+                record.getField('bp_bank_account_num').setReadOnly(true);
+                record.getField('bp_bank_account_name').setReadOnly(true);
+                record.getField('opposite_band_na').setReadOnly(true);
+                record.getField('bp_bank_branch_name').setReadOnly(true);
+            }
+
             };
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
@@ -130,6 +175,8 @@
 
         //add by zhuxianfei 20181108 拒绝需要输入意见
         function zjwfl5110_beforeapproveCheck(type) {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var return_recode = $(ds_id).getCurrentRecord();
             if (type == 'refuse') {
                 if ('${/parameter/@instance_id}') {
                     var root_ds = $('${/parameter/@layout_code}_virtual_ds');
@@ -145,8 +192,23 @@
             }else {
                     return true;
             }
-
         }
+        if("${/model/post_info/record/@position_code}"=="012") {
+            zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
+                var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+                var return_recode = $(ds_id).getCurrentRecord();
+                var root_ds = $('${/parameter/@layout_code}_virtual_ds');
+                if (type == 'agree') {
+                    if (Leaf.isEmpty(return_recode.get('finance_flag'))||return_recode.get('finance_flag')!='Y') {
+                        Leaf.showMessage('提示', '请先审核第三方银行信息，并进行勾选通过。');
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }else return true;
+            });
+        }
+
 
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_deposit_transfer_maintain.lview

@@ -79,6 +79,7 @@
         ]]></script>
         <a:dataSets>
             <a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
+            <a:dataSet id="TRANS_REVIEW_STATUS_DS" lookupCode="TRANS_REVIEW_STATUS"/>
             <a:dataSet id="csh_deposit_transfer_maintain_query_ds" autoCreate="true">
                 <a:fields>
                     <a:field name="deposit_trans_type"/>
@@ -87,6 +88,8 @@
                     <a:field name="bp_id_telnet_n"/>
                     <a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
                              returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
+                    <a:field name="trans_review_status_desc" options="TRANS_REVIEW_STATUS_DS"
+                             returnField="trans_review_status" displayField="code_value_name" valueField="code_value"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="deposit_transfer_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query" queryDataSet="csh_deposit_transfer_maintain_query_ds" selectable="true" selectionModel="single">
@@ -105,6 +108,7 @@
                 <a:textField name="bp_name_n"  prompt="代理店" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
                 <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
                 <a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
+                <a:comboBox name="trans_review_status_desc" prompt="复核状态" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
             </a:form>
             <a:fieldSet  labelWidth="150" style="margin-left:20px">
             <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
@@ -116,6 +120,7 @@
                         <a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110"  renderer="Leaf.formatMoney"  align="right" />
                         <a:column name="approve_status" prompt="状态" width="120" align="center"/>
+                        <a:column name="trans_review_status_n" prompt="复核状态" width="120" align="center"/>
                     </a:columns>
             </a:grid>
             </a:fieldSet>

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -10,6 +10,7 @@
     <a:init-procedure>
         <a:model-query fetchAll="true" model="hls.HLS213N.hls_bp_master_unit" rootPath="user_agent_description"/>
         <a:model-query fetchAll="true" model="hls.HLS214N.hls_bp_master_modify_user" rootPath="modify_user"/>
+        <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
     </a:init-procedure>
     <a:view>
         <a:link id="get_special_fields_link_id" model="hls.HLS213N.social_code_exist" modelaction="update"/>
@@ -29,17 +30,19 @@
             var employee_type_id = '${/model/modify_user/record/@employee_type_id}';
 
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
-
             var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
 
             var address_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_address');
 
             var bp_record = $(bp_ds_id).getCurrentRecord();
+            var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_account');
+            var bank_record = $(bank_ds_id).getCurrentRecord();
 
             bp_record.set('bp_category', '${/parameter/@bp_category}');
             bp_record.set('owner_user_id', '${/session/@user_id}');
             bp_record.set('unit_id', unit_id);
             bp_record.set('unit_id_n', unit_id_n);
+            if(bp_record.get('bp_type')!='THIRD_PARTY'){
                 if (employee_type_id == '64') {
                     bp_record.getField('unit_id_n').setReadOnly(true);
                     bp_record.getField('unit_id_n').setRequired(false);
@@ -47,9 +50,12 @@
                     bp_record.getField('unit_id_n').setReadOnly(false);
                     bp_record.getField('unit_id_n').setRequired(true);
                 }
+            }
+
             if ('${/parameter/@bp_type}' == 'AGENT') {
                 bp_record.getField('agent_type_n').setReadOnly(false);
                 // bp_record.getField('agent_type_n').setRequired(true);
+
             } else {
                 bp_record.getField('agent_type_n').setReadOnly(true);
                 // bp_record.getField('agent_type_n').setRequired(false);
@@ -75,7 +81,7 @@
                 bp_master_role_ds.add(record);
                 var address_ds_id_ds = $(address_ds_id);
                 var address_bp_record = $('${/parameter/@default_value_dsid}').getCurrentRecord();
-                if (address_bp_record.get('bp_class') == 'NP'){
+                if (address_bp_record.get('bp_class') == 'NP'&&record.get('bp_type') != 'THIRD_PARTY'){
                     //POSTAL_ADDRESS  通讯地址
                     var record1 = new Leaf.Record({
                         'address_type': 'HOUSEHOLD_ADDRESS',
@@ -100,9 +106,10 @@
                     address_record1.getField('address_type_n').setReadOnly(true);
                     address_record1.getField('country_id_n').setReadOnly(true);
 
-                }else if (address_bp_record.get('bp_class') == 'ORG'){
+                }else if (address_bp_record.get('bp_class') == 'ORG'&&record.get('bp_type') != 'THIRD_PARTY'){
                     //法人
                     //POSTAL_ADDRESS  通讯地址
+                    if(bp_record.get('bp_type')!='THIRD_PARTY') {
                         var record2 = new Leaf.Record({
                             'address_type': 'POSTAL_ADDRESS',
                             'address_type_n': '通讯地址',
@@ -115,6 +122,7 @@
                         address_record.getField('address_type_n').setReadOnly(true);
                         address_record.getField('country_id_n').setReadOnly(true);
                     }
+                }
                 var current_record = bp_master_role_ds.getAt(0);
                 current_record.getField('bp_type_n').setReadOnly(true);
                 current_record.getField('enabled_flag').setReadOnly(true);
@@ -163,6 +171,17 @@
         };
 
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
+            //第三方创建页面隐藏角色新增按钮
+            debugger;
+            if( record.get('bp_type')== 'THIRD_PARTY'){
+                if(document.getElementById('${/parameter/@layout_code}_G_ROLE_ADD_layout_dynamic_button_id')){
+                    document.getElementById('${/parameter/@layout_code}_G_ROLE_ADD_layout_dynamic_button_id').style.display = "none";
+                }
+                if(document.getElementById('${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_button_id')){
+                    document.getElementById('${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_button_id').style.display = "none";
+                }
+            }
+
 
             if ((ds.id).indexOf('hls_bp_master') != -1) {
                 // record.getField('cell_phone').setRequired(true);
@@ -176,6 +195,7 @@
                 if (ds.fields.parent_id) {
                     record.getField('parent_id_n').setReadOnly(true);
                 }
+
                 if (record.get('bp_class') && record.get('bp_class') == 'ORG') {
                     if (record.get('invoice_method') == 'BILLING') {
                             record.getField('taxpayer_type').setRequired(true);
@@ -216,7 +236,7 @@
 
                 }
                 record.set('invoice_title', record.get('bp_name'));
-                if(record.get('taxpayer_type') == 'GENERAL_TAXPAYER'){
+                if(record.get('taxpayer_type') == 'GENERAL_TAXPAYER'&&record.get('bp_type') != 'THIRD_PARTY'){
                     //设置开票类型为纸质只读
                     record.set('invoice_type','PAPER');
                     record.set('invoice_type_n','纸质发票');
@@ -225,7 +245,7 @@
                     record.getField('invoice_type').setRequired(false);
                     record.getField('invoice_type_n').setRequired(false);
                     record.getField('reception_maile').setRequired(false);
-                }else if(record.get('taxpayer_type') == 'SMALL_SCALE_TAXPAYER'){
+                }else if(record.get('taxpayer_type') == 'SMALL_SCALE_TAXPAYER'&&record.get('bp_type') != 'THIRD_PARTY'){
                     record.set('invoice_type','ECT');
                     record.set('invoice_type_n','电子发票');
                     record.getField('invoice_type').setRequired(true);
@@ -407,11 +427,72 @@
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var head_record = $(ds_id).getCurrentRecord();
+            var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_account');
+            var bank_record = $(bank_ds_id).getAll();
+            var file_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
+            var file_record = $(file_ds_id).getAll();
+            if(bank_record.length>0){
+                var flag = true;
+                for(var i=0;i<bank_record.length;i++){
+                    var full_name=bank_record[i].get('bank_full_name');
+                    var branch_name=bank_record[i].get('bank_branch_name');
+                    if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
+                        !Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
+                        if(branch_name.indexOf(full_name)==-1){
+                            flag = false;
+                        }
+                    }
+                    if(flag == false){
+                        Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
+                        return false;
+                    }
+                }
+            }
+            var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
+            var role_records = $(role_ds_id).getAll();
+            var role_flag=true;
+            if(role_records.length>1){
+                for (var i = 0;i < role_records.length;i++) {
+                    if(role_records[i].get('bp_type')=='THIRD_PARTY'){
+                        role_flag=false;
+                    }
+                }
+            }
+            if(role_flag==false){
+                Leaf.showErrorMessage('${l:PROMPT}', '第三方不能含有其他角色类型');
+                return false;
+            }
+
+             if(head_record.get('bp_type')=='THIRD_PARTY'){
+                var flag = true;
+                if (bank_record.length <=0){
+                    Leaf.showErrorMessage('${l:PROMPT}', '第三方必填[银行帐户信息],请在银行帐户信息新增!');
+                    return false;
+                } else{
+                    for(var i=0;i<bank_record.length;i++){
+                        if (Leaf.isEmpty(bank_record[i].get('bank_account_name'))||
+                            Leaf.isEmpty(bank_record[i].get('bank_account_num'))||
+                            Leaf.isEmpty(bank_record[i].get('bank_full_name'))){
+                            flag = false;
+                            break;
+                        }
+                        else{
+                            flag = true;
+                        }
+                   }
+                if(flag == false){
+                    Leaf.showErrorMessage('${l:PROMPT}', '请将银行账户信息填写完整');
+                    return false;
+                }
+
+
+            }
+             }
 
             //验证是否有户籍地址，或者通讯地址
             var address_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_address');
             var records_addr = $(address_ds_id).getAll();``
-            if (head_record.get('bp_class') =='NP'){
+            if (head_record.get('bp_class') =='NP'&&head_record.get('bp_type')!='THIRD_PARTY'){
                 //判断户籍地址
                 var flag = true;
                 if (records_addr.length <=0){
@@ -441,7 +522,7 @@
                         return  false;
                     }
                 }
-            }else if (head_record.get('bp_class') == 'ORG'){
+            }else if (head_record.get('bp_class') == 'ORG'&&head_record.get('bp_type')!='THIRD_PARTY'){
                 //判断通讯地址
                 var flag1 = true;
                 if (records_addr.length <= 0){
@@ -767,7 +848,7 @@
                     }
                 }
                 if (name == 'taxpayer_type' && value) {
-                    if (record.get('bp_class') == 'ORG') {
+                    if (record.get('bp_class') == 'ORG'&&record.get('bp_type') != 'THIRD_PARTY') {
                         if (value == 'SMALL_SCALE_TAXPAYER') {
 
                             record.getField('taxpayer_type').setRequired(true);
@@ -832,6 +913,7 @@
 
             var role_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
             if (role_ds == ds.id) {
+                var flag=true;
                 var bp_type_flag='N';
                 var records = $(ds.id).getAll();
                 if(name=='bp_type'){
@@ -849,8 +931,10 @@
                             }
                         }
                     }
+
                 }
 
+
                 var primary_flag = record.get('primary_flag');
                 if (primary_flag == 'Y') {
                     var bm_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
@@ -865,6 +949,7 @@
         };
 
         function upload_file(id, name, query_only) {
+            debugger;
             var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
             if (record.get('check_id')) {
                 var url;

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview

@@ -6,6 +6,10 @@
     $Purpose: 商业伙伴创建   入口界面
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
+        <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="hls.HLS214N.sys_user_lv" rootPath="user_name_path"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="hls_bp_master_link" url="${/request/@context_path}/modules/hls/HLS213N/hls_bp_master_create.lview"/>
         <a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
@@ -14,6 +18,15 @@
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var record = $(ds_id).getCurrentRecord();
             if ($(ds_id).validate()) {
+                if(record.get('bp_type')=='THIRD_PARTY'){
+                    record.set('function_code', 'HLS213D_N');
+                    record.set('function_usage', 'CREATE');
+                    record.set('default_value_dsid', ds_id);
+                    record.data['url_title'] = '商业伙伴创建';
+                    var param = record.data;
+                    hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
+
+                }else{
                     record.set('function_code', 'HLS213D');
                     record.set('function_usage', 'CREATE');
                     record.set('default_value_dsid', ds_id);
@@ -21,6 +34,7 @@
                     var param = record.data;
                     hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
                 }
+            }
         };
         //更新时调用
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq){
@@ -50,14 +64,27 @@
 
         window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
             var bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
-            if(ds.id == bp_create_ds_id){
-                var r= $(bp_create_ds_id).getCurrentRecord();
-                if(!r.get('bp_category')){
-                    r.set('bp_category','TENANT');
-                    r.set('bp_category_n','承租人');
+            if(ds.id == bp_create_ds_id) {
+                var r = $(bp_create_ds_id).getCurrentRecord();
+                if (!r.get('bp_category')) {
+                    if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
+                        r.set('bp_category', 'THIRD_PARTY');
+                        r.set('bp_category_n', '第三方');
+                    }else{
+                        r.set('bp_category', 'TENANT');
+                        r.set('bp_category_n', '承租人');
                     }
+
                 }
 
+                if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
+                    r.set('bp_type','THIRD_PARTY');
+                    r.set('bp_type_n', '第三方');
+                }else{
+                    r.set('bp_type','TENANT') ;
+                    r.set('bp_type_n', '承租人');
+                }
+            }
         };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview

@@ -47,6 +47,26 @@
             //             return;
             //         }
             //     }
+            var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_account');
+            var bank_record = $(bank_ds_id).getAll();
+            var flag = true;
+            if(bank_record.length>0){
+                for(var i=0;i<bank_record.length;i++){
+                    var full_name=bank_record[i].get('bank_full_name');
+                    var branch_name=bank_record[i].get('bank_branch_name');
+                    if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
+                        !Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
+                        if(branch_name.indexOf(full_name)==-1){
+                            flag = false;
+                        }
+                    }
+                }
+            }
+            if(flag == false){
+                Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
+                return false;
+            }
+
             var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
             var v_primary_flag_count=0;
             var role_records = $(role_ds_id).getAll();

src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify_entrance.lview

@@ -10,6 +10,7 @@
     <a:init-procedure>
         <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
         <a:model-query fetchAll="true" model="basic.hls_sys_time_default_value" rootPath="default_value"/>
+        <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="hls.HLS214N.sys_user_lv" rootPath="user_name_path"/>
     </a:init-procedure>
     <a:view>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
@@ -41,6 +42,10 @@
             var record=$(ds_id).selected[0];
             var param = record.data;
             var bp_class = record.get('bp_class');
+            if(record.get('bp_type')=='THIRD_PARTY'){
+                Leaf.showMessage('提示', '第三方不能开票申请');
+                return;
+            }
             if(record.get('invoice_wfl_status') == 'APPROVING' || record.get('bp_wfl_status') == 'APPROVING'){
                 //审批中调用
                 param['function_code'] = 'HLS214BR_Q';
@@ -96,7 +101,6 @@
                     success: function (res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         if (res.result.change_req_id) {
-
                             param['winid'] = 'bp_master_invoice_detail_win';
                             param['function_code'] = 'HLS214B';
                             param['bp_class'] = bp_class;
@@ -140,6 +144,16 @@
                 param['query_only'] = 'Y';
                 hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
             }else if (record.get('invoice_wfl_status') != 'APPROVING' && record.get('bp_wfl_status') != 'APPROVING'){
+                if (record.get('bp_type')=='THIRD_PARTY'&&"${/model/role_info/record/@role_code}"!="HAND"&&"${/model/user_name_path/record/@user_name}"!="DSF001"&&"${/model/user_name_path/record/@user_name}"!="DSF002") {
+                    param['function_code'] = 'HLS215D';
+                    param['function_usage'] = 'QUERY';
+                    param['bp_class'] = bp_class;
+                    param['cond_para1'] = user_category;
+                    param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                    param['query_only'] = 'Y';
+                    hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
+                    return;
+                }
 
                 if(submit_flag == 'Y'){
                     window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
@@ -151,7 +165,20 @@
                         success: function (res) {
                             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                             if(res.result.change_req_id){
-
+                                if(record.get('bp_type')=='THIRD_PARTY'){
+                                    param['function_code'] = 'HLS214F_N';
+                                    param['function_usage'] = 'MODIFY';
+                                    param['bp_class'] = bp_class;
+                                    param['change_req_id'] = res.result.change_req_id;
+                                    param['document_id'] = res.result.change_req_id;
+                                    param['cond_para1'] = user_category;
+                                    param['bp_name_updated_flag'] = record.get('bp_name_updated_flag');
+                                    param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                                    param['query_only'] = 'N';
+                                    param['delete_flag'] = 'Y';
+                                    // param['layout_debugger_flag']='Y';
+                                    hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_req_modify_link', ds_id);
+                                }else{
                                     param['function_code'] = 'HLS214F';
                                     param['function_usage'] = 'MODIFY';
                                     param['bp_class'] = bp_class;
@@ -165,6 +192,43 @@
                                     // param['layout_debugger_flag']='Y';
                                     hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_req_modify_link', ds_id);
                                 }
+
+                            }
+                        },
+                        failure: function () {
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        },
+                        error: function () {
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        },
+                        scope: this
+                    });
+                }else{
+                    if(record.get('bp_type')=='THIRD_PARTY'){
+                        window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+                        var url = '${/request/@context_path}/autocrud/hls.HLS214N.hls_bp_master_req_create/execute';
+                        Leaf.request({
+                            url: url,
+                            para: {
+                                bp_id: record.get('bp_id')
+                            },
+                            success: function (res) {
+                                window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                                if(res.result.change_req_id){
+                                    param['function_code'] = 'HLS214F_N';
+                                    param['function_usage'] = 'MODIFY';
+                                    param['bp_class'] = bp_class;
+                                    param['change_req_id'] = res.result.change_req_id;
+                                    param['document_id'] = res.result.change_req_id;
+                                    param['cond_para1'] = user_category;
+                                    param['bp_name_updated_flag'] = record.get('bp_name_updated_flag');
+                                    param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                                    param['query_only'] = 'N';
+                                    param['delete_flag'] = 'Y';
+                                    // param['layout_debugger_flag']='Y';
+                                    hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_req_modify_link', ds_id);
+                                }
+
                             },
                             failure: function () {
                                 window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -183,6 +247,8 @@
                         param['query_only'] = 'N';
                         hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
                     }
+
+                }
             }
         }
 

src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview

@@ -50,6 +50,7 @@
             //     }
             var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role_req');
             var v_primary_flag_count=0;
+            var role_flag=true;
             var role_records = $(role_ds_id).getAll();
             for (var i = 0;i < role_records.length;i++) {
                 if(role_records[i].get('primary_flag') == 'Y'){
@@ -61,14 +62,69 @@
                 Leaf.showErrorMessage('错误', '一个商业伙伴有且仅有一个主角色！');
                 return  false;
             }
-
-
-
+            if(role_records.length>1){
+                for (var i = 0;i < role_records.length;i++) {
+                    if(role_records[i].get('bp_type')=='THIRD_PARTY'){
+                        role_flag=false;
+                    }
+                }
+            }
+            if(role_flag==false){
+                Leaf.showErrorMessage('${l:PROMPT}', '第三方不能含有其他角色类型');
+                return false;
+            }
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_req');
             var bp_record = $(ds_id).getCurrentRecord();
             var address_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_address_req');
             var records_addr = $(address_ds_id).getAll();
-            if (bp_record.get('bp_class') == 'NP'){
+
+            var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_acc_req');
+            var bank_record = $(bank_ds_id).getAll();
+            var flag = true;
+            if(bank_record.length>0){
+                for(var i=0;i<bank_record.length;i++){
+                    var full_name=bank_record[i].get('bank_full_name');
+                    var branch_name=bank_record[i].get('bank_branch_name');
+                    if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
+                        !Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
+                        if(branch_name.indexOf(full_name)==-1){
+                            flag = false;
+                        }
+                    }
+                }
+            }
+            if(flag == false){
+                Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
+                return false;
+            }
+
+            if(bp_record.get('bp_type')=='THIRD_PARTY'){
+                var flag = true;
+                if (bank_record.length <=0){
+                    Leaf.showErrorMessage('${l:PROMPT}', '第三方必填[银行帐户信息],请在银行帐户信息新增!');
+                    return false;
+                } else{
+                    for(var i=0;i<bank_record.length;i++){
+                        if (Leaf.isEmpty(bank_record[i].get('bank_account_name'))||
+                            Leaf.isEmpty(bank_record[i].get('bank_account_num'))||
+                            Leaf.isEmpty(bank_record[i].get('bank_full_name'))){
+                            flag = false;
+                            break;
+                        }
+                        else{
+                            flag = true;
+                        }
+                    }
+                    if(flag == false){
+                        Leaf.showErrorMessage('${l:PROMPT}', '请将银行账户信息填写完整');
+                        return false;
+                    }
+
+
+                }
+            }
+
+            if (bp_record.get('bp_class') == 'NP'&&bp_record.get('bp_type')!='THIRD_PARTY'){
                 //判断户籍地址
                 var flag = true;
                 if (records_addr.length <=0){
@@ -99,7 +155,7 @@
                     }
                 }
 
-            }else if (bp_record.get('bp_class') == 'ORG'){
+            }else if (bp_record.get('bp_class') == 'ORG'&&bp_record.get('bp_type')!='THIRD_PARTY'){
                 //判断通讯地址
                 var flag1 = true;
                 if (records_addr.length <= 0){
@@ -325,7 +381,9 @@
         var new_id_card;
         var old_bp_name;
         var new_bp_name;
-
+        // window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add_and_load'] = function (ds, record, config_records, bp_seq) {
+        //
+        // }
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
             // if ((ds.id).indexOf('hls_bp_master_credit') != -1 && (ds.id).indexOf('F_ORG_CREDIT') != -1) {
@@ -337,6 +395,16 @@
             // }
             // }
             // }
+
+            if( record.get('bp_type')== 'THIRD_PARTY'){
+                if(document.getElementById('${/parameter/@layout_code}_G_ROLE_ADD_layout_dynamic_button_id')){
+                    document.getElementById('${/parameter/@layout_code}_G_ROLE_ADD_layout_dynamic_button_id').style.display = "none";
+                }
+                if(document.getElementById('${/parameter/@layout_code}_G_ROLE_DELETE_layout_dynamic_button_id')){
+                    document.getElementById('${/parameter/@layout_code}_G_ROLE_DELETE_layout_dynamic_button_id').style.display = "none";
+                }
+            }
+
             if ((ds.id).indexOf('hls_bp_master_req') != -1 && (ds.id).indexOf('F_BASIC') != -1) {
 
                 var employee_type_id = '${/model/modify_user/record/@employee_type_id}';
@@ -403,6 +471,7 @@
                 }
             }
             var role_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_ROLE', 'hls_bp_master_role_req');
+
             if("${/model/role_info/record/@role_code}"!="0017"&&"${/model/role_info/record/@role_code}"!="HAND"){
                 if(role_ds_id == ds.id){
                     var records = $(ds.id).getAll();
@@ -890,6 +959,26 @@
                 Leaf.showMessage('提示', '请先保存！');
                 return;
             }
+
+            var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_acc_req');
+            var bank_record = $(bank_ds_id).getAll();
+            var flag = true;
+            if(bank_record.length>0){
+                for(var i=0;i<bank_record.length;i++){
+                    var full_name=bank_record[i].get('bank_full_name');
+                    var branch_name=bank_record[i].get('bank_branch_name');
+                    if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
+                        !Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
+                        if(branch_name.indexOf(full_name)==-1){
+                            flag = false;
+                        }
+                    }
+                }
+            }
+            if(flag == false){
+                Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
+                return false;
+            }
             if ($(ds_id).validate()) {
                 var record = $(ds_id).getAt(0);
                 Leaf.showConfirm('${l:HLS.PROMPT}', '确定提交审批吗？', function () {

src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview

@@ -150,6 +150,26 @@
             var agent_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var  record_agent =$(agent_id).getAll();
+            var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_account');
+            var bank_record = $(bank_ds_id).getAll();
+            if(bank_record.length>0){
+                var flag = true;
+                for(var i=0;i<bank_record.length;i++){
+                    var full_name=bank_record[i].get('bank_full_name');
+                    var branch_name=bank_record[i].get('bank_branch_name');
+                    if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
+                        !Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
+                        if(branch_name.indexOf(full_name)==-1){
+                            flag = false;
+                        }
+                    }
+
+                    if(flag == false){
+                        Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
+                        return false;
+                    }
+                }
+            }
             //增加三位字母大写的校验
             var head_record = $(ds_id).getCurrentRecord();
             var english_name= head_record.get('english_name');
@@ -178,11 +198,12 @@
                     return false;
                 }}
             if(social_code){
-                if(!CheckSocialCreditCode(social_code)){
-                    $L.showErrorMessage("错误",'请输入正确的社会信用代码！',null,null);
-                    window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    return false;
-                }}
+                // if(!CheckSocialCreditCode(social_code)){
+                //     $L.showErrorMessage("错误",'请输入正确的社会信用代码！',null,null);
+                //     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                //     return false;
+                // }
+                }
         };
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
@@ -308,6 +329,9 @@
                 record.getField('agent_bs_area_level').setPropertity('validator', 'hls303_record_field_validator');
                 record.getField('validity_period_from').setPropertity('validator', 'hls303_record_field_validator');
                 record.getField('validity_period_to').setPropertity('validator', 'hls303_record_field_validator');
+                if(record.get('extra_nam')=='茂甲'||record.get('extra_nam')=='铁甲'){
+                    record.getField('agent_phone').setRequired(true);
+                }
             }
             if (ds_renew_id == ds.id) {
                 ds.getField('valid_date_to').setPropertity('validator', 'hls303d_record_field_validator');

src/main/webapp/modules/hsbc/HSBC100/csh_bank_account_choose.lview

@@ -2,14 +2,16 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
     <a:view>
         <a:link id="hsbc_paying_batch_create_link_id" url="${/request/@context_path}/modules/hsbc/HSBC100/hsbc_paying_batch_create.lsc"/>
+        <a:link id="hsbc_paying_batch_create_return_link_id" url="${/request/@context_path}/modules/hsbc/HSBC100/hsbc_paying_batch_create_return.lsc"/>
         <script><![CDATA[
         function create_paying_batch() {
-            Leaf.Masker.mask(Ext.getBody(), '付款单生成中...');
+            var winId = '${/parameter/@winId}';
+            Leaf.Masker.mask($(winId).wrap, '付款单生成中...');
             var account_ds = $('csh_bank_account');
             var bank_account_id = account_ds.getAt(0).get('bank_account_id');
             if (Ext.isEmpty(bank_account_id)) {
                 Leaf.showMessage('提示', '请先选择账户代码！');
-                Leaf.Masker.unmask(Ext.getBody());
+                Leaf.Masker.unmask($(winId).wrap);
             } else {
                 var req_ln_ds = $('${/parameter/@ds_id}');
                 var button_id = '${/parameter/@button_id}';
@@ -25,23 +27,32 @@
                 param['details'] = saveData;
                 param['bank_account_id'] = bank_account_id;
                 param['button_id'] = button_id;
+
+                var pay_type = '${/parameter/@pay_type}';
+                var url;
+                if (pay_type == 'TJ'){
+                    url = $('hsbc_paying_batch_create_link_id').getUrl();
+                }else if(pay_type == 'RETURN'){
+                    url = $('hsbc_paying_batch_create_return_link_id').getUrl();
+                }
+
                 Leaf.request({
-                    url: $('hsbc_paying_batch_create_link_id').getUrl(),
+                    url: url,
                     para: param,
                     success: function() {
                         Leaf.SideBar.show({
                             msg: '付款单生成成功！',
                             duration: 2000
                         });
-                        Leaf.Masker.unmask(Ext.getBody());
+                        Leaf.Masker.unmask($(winId).wrap);
                         $('${/parameter/@winId}').close();
                         req_ln_ds.query();
                     },
                     failure: function() {
-                        Leaf.Masker.unmask(Ext.getBody());
+                        Leaf.Masker.unmask($(winId).wrap);
                     },
                     error: function() {
-                        Leaf.Masker.unmask(Ext.getBody());
+                        Leaf.Masker.unmask($(winId).wrap);
                     },
                     scope: this
                 });

src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview

@@ -10,19 +10,65 @@
     <a:view>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="pageLink_choose_acount" url="${/request/@context_path}/modules/hsbc/HSBC100/csh_bank_account_choose.lview"/>
+        <a:link id="${/parameter/@layout_code}con_contract_query_link" url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
+        <a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
+        <script src="${/request/@context_path}/javascripts/calculate.js"/>
         <script type="text/javascript"><![CDATA[
+
+        function open_contract_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_usage'] = 'QUERY';
+            param['function_code'] = 'CON3200Q';
+            param['maintain_type'] = 'QUERY';
+            param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
+        }
+
+        function open_return_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var header_id = record.data.return_id;
+            var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
+            var win = new Leaf.Window({
+                url: url,
+                title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                id: 'transaction_return_uploadFile_id',
+                width: 850,
+                height: 400
+            });
+        }
+
+        window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
+            if (name == 'contract_number' && value) {
+                return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
+            }
+            if (name == 'attachment_r') {
+                return '<a href="javascript:open_return_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + '附件' + '</a>';
+            }
+            return value;
+        };
+
         //创建代付单
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
             var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
             var req_ln_ds = $(req_ln_ds_id);
+            var con_ds = $(con_ds_id);
             var req_ln_records = req_ln_ds.getSelected();
+            var con_records = con_ds.getSelected();
+            if (req_ln_records.length == 0 || con_records.length > 0) {
+                Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！');
+                return;
+            }
             new Leaf.Window({
                 id: 'choose_acount_window',
                 url: $('pageLink_choose_acount').getUrl(),
                 params: {
                     winId: 'choose_acount_window',
                     ds_id: req_ln_ds_id,
-                    button_id: 'create_with_sbo'
+                    button_id: 'create_with_sbo',
+                    pay_type: 'TJ'
                 },
                 title: '支付账号选择',
                 height: 260,
@@ -33,15 +79,76 @@
         //创建强制付款单生成
         window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
             var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
             var req_ln_ds = $(req_ln_ds_id);
+            var con_ds = $(con_ds_id);
             var req_ln_records = req_ln_ds.getSelected();
+            var con_records = con_ds.getSelected();
+            if (req_ln_records.length == 0 || con_records.length > 0) {
+                Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！');
+                return;
+            }
             new Leaf.Window({
                 id: 'choose_acount_window',
                 url: $('pageLink_choose_acount').getUrl(),
                 params: {
                     winId: 'choose_acount_window',
                     ds_id: req_ln_ds_id,
-                    button_id: 'create_without_sbo'
+                    button_id: 'create_without_sbo',
+                    pay_type: 'TJ'
+                },
+                title: '支付账号选择',
+                height: 260,
+                width: 680
+            });
+        };
+        //创建代付单
+        window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+            var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var req_ln_ds = $(req_ln_ds_id);
+            var con_ds = $(con_ds_id);
+            var req_ln_records = req_ln_ds.getSelected();
+            var con_records = con_ds.getSelected();
+            if (con_records.length == 0 || req_ln_records.length > 0) {
+                Leaf.showMessage('${l:PROMPT}', '只能勾选退款付款单数据！');
+                return;
+            }
+            new Leaf.Window({
+                id: 'choose_acount_window',
+                url: $('pageLink_choose_acount').getUrl(),
+                params: {
+                    winId: 'choose_acount_window',
+                    ds_id: con_ds_id,
+                    button_id: 'create_with_sbo',
+                    pay_type: 'RETURN'
+                },
+                title: '支付账号选择',
+                height: 260,
+                width: 680
+            });
+        };
+
+        //创建强制付款单生成
+        window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
+            var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var req_ln_ds = $(req_ln_ds_id);
+            var con_ds = $(con_ds_id);
+            var req_ln_records = req_ln_ds.getSelected();
+            var con_records = con_ds.getSelected();
+            if (con_records.length == 0 || req_ln_records.length > 0) {
+                Leaf.showMessage('${l:PROMPT}', '只能勾选退款付款单数据！');
+                return;
+            }
+            new Leaf.Window({
+                id: 'choose_acount_window',
+                url: $('pageLink_choose_acount').getUrl(),
+                params: {
+                    winId: 'choose_acount_window',
+                    ds_id: con_ds_id,
+                    button_id: 'create_without_sbo',
+                    pay_type: 'RETURN'
                 },
                 title: '支付账号选择',
                 height: 260,
@@ -49,6 +156,56 @@
             });
         };
 
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
+            var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
+            var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var form_record = $(form_ds_id).getAt(0);
+            var req_records = $(req_ln_ds_id).getSelected();
+            var con_records = $(con_ds_id).getSelected();
+
+            if (req_ln_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < req_records.length;i++) {
+                    sum = plus(sum, req_records[i].get('unpaid_amount'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+
+            if (con_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < con_records.length;i++) {
+                    sum = plus(sum, con_records[i].get('this_return_amount'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+        };
+
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_unselect'] = function(ds, record, bp_seq) {
+            var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
+            var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var form_record = $(form_ds_id).getAt(0);
+            var req_records = $(req_ln_ds_id).getSelected();
+            var con_records = $(con_ds_id).getSelected();
+
+            if (req_ln_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < req_records.length;i++) {
+                    sum = plus(sum, req_records[i].get('unpaid_amount'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+
+            if (con_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < con_records.length;i++) {
+                    sum = plus(sum, con_records[i].get('this_return_amount'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+        };
+
 ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create_return.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
+    <a:init-procedure>
+        <a:model-delete model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
+        <batch-apply sourcePath="/parameter/details">
+            <a:model-insert model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
+        </batch-apply>
+        <a:model-update model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>

src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview

@@ -36,10 +36,19 @@
         //代付单发送
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
+            var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
             var batch_ds = $(ds_id);
             var records = batch_ds.getSelected();
 
-            if (records.length == 0) {
+            var r_batch_ds = $(r_ds_id);
+            var r_records = r_batch_ds.getSelected();
+
+            if (records.length != 0 && r_records.length != 0) {
+                Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
+                return;
+            }
+
+            if (records.length == 0  && r_records.length == 0) {
                 Leaf.showMessage('${l:PROMPT}', '请选择至少一条数据！');
                 return;
             }
@@ -49,6 +58,7 @@
             var send_url;
             var bank_note='汇丰银行';
 
+            if (records.length != 0){
                 for (var i = 0;i < records.length;i++) {
                     var rec;
                     rec = records[i];
@@ -56,6 +66,15 @@
                     saveData.push(rec.data);
                 }
                 length = records.length;
+            }else{
+                for (var i = 0;i < r_records.length;i++) {
+                    var rec;
+                    rec = r_records[i];
+                    rec.set('_status', 'insert');
+                    saveData.push(rec.data);
+                }
+                length = r_records.length;
+            }
             param['details'] = saveData;
 
             send_url=$('batch_hsbc_send_link').getUrl();
@@ -68,6 +87,7 @@
                     success: function(res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         batch_ds.query();
+                        r_batch_ds.query();
                     },
                     failure: function(res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -85,31 +105,55 @@
         //人工支付  --add by 24976
         window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
+            var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
             var batch_ds = $(ds_id);
             var records = batch_ds.getSelected();
 
+            var r_batch_ds = $(r_ds_id);
+            var r_records = r_batch_ds.getSelected();
+
             var lease_channel;
             var reqsn;
             var batch_id;
             var bank_item;
 
-            if (records.length != 1) {
+            if (records.length != 0 && r_records.length != 0) {
+                Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
+                return;
+            }
+
+            if (records.length != 1  && r_records.length == 0) {
                 Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
                 return;
             }
 
+            if (records.length == 0  && r_records.length != 1) {
+                Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
+                return;
+            }
+            if (records.length != 0){
+                reqsn = records[0].get('reqsn');
+                batch_id = records[0].get('batch_id');
+                bank_item=records[0].get('bank_item');
+            }else {
+                reqsn = r_records[0].get('reqsn');
+                batch_id = r_records[0].get('batch_id');
+                bank_item=r_records[0].get('bank_item');
+            }
+
             var win = new Leaf.showConfirm('${l:HLS.PROMPT}', '使用人工支付将不能再使用银企直连，确认进行人工支付？', function() {
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
                     url: $('manual_modify_link').getUrl(),
                     para: {
-                        batch_id : records[0].get('batch_id'),
-                        reqsn : records[0].get('reqsn'),
-                        bank_item : records[0].get('bank_item')
+                        batch_id : batch_id,
+                        reqsn : reqsn,
+                        bank_item : bank_item
                     },
                     success: function(res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         batch_ds.query();
+                        r_batch_ds.query();
                     },
                     failure: function(res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -125,26 +169,50 @@
         //付款单取消
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
+            var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
             var batch_ds = $(ds_id);
             var records = batch_ds.getSelected();
 
-            if (records.length != 1 ) {
+            var r_batch_ds = $(r_ds_id);
+            var r_records = r_batch_ds.getSelected();
+
+            if (records.length != 0 && r_records.length != 0) {
+                Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
+                return;
+            }
+
+            if (records.length != 1  && r_records.length == 0) {
+                Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
+                return;
+            }
+
+            if (records.length == 0  && r_records.length != 1) {
                 Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
                 return;
             }
+            if (records.length != 0){
+                reqsn = records[0].get('reqsn');
+                batch_id = records[0].get('batch_id');
+                bank_item=records[0].get('bank_item');
+            }else {
+                reqsn = r_records[0].get('reqsn');
+                batch_id = r_records[0].get('batch_id');
+                bank_item=r_records[0].get('bank_item');
+            }
 
             Leaf.showConfirm('${l:HLS.PROMPT}', '确认取消？', function() {
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
                     url: $('batch_cancel_link').getUrl(),
                     para: {
-                        batch_id : records[0].get('batch_id'),
-                        reqsn : records[0].get('reqsn'),
-                        bank_item : records[0].get('bank_item')
+                        batch_id : batch_id,
+                        reqsn : reqsn,
+                        bank_item : bank_item
                     },
                     success: function(res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         batch_ds.query();
+                        r_batch_ds.query();
                     },
                     failure: function(res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -166,7 +234,7 @@
         });
 
 
-]]></script>
+        ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>
 </a:screen>
\ No newline at end of file

src/main/webapp/modules/prj/PRJ001/sys_user_query.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: ouyangzhaochang2663 $
+    $Date: 2011/02/21 08:37:47 $
+    $Revision: 1.8 $
+    $Purpose: UPDATE BY DJ 重构大部分代码
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <a:model-query model="sys.sys_user" rootPath="user_model"/>
+    </a:init-procedure>
+    <a:view>
+        <script><![CDATA[
+
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="editDs" model="prj.PRJ001.wh_train_project">
+            </a:dataSet>
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:gridButton click="editScreen_close" text="HLS.CLOSE"/>
+            </a:screenTopToolbar>
+            <a:fieldSet column="2" labelWidth="100" title="详情" width="500">
+                <a:textField name="project_number" bindTarget="editDs" prompt="项目编号"/>
+                <a:textField name="amount" bindTarget="editDs" prompt="项目金额"/>
+            </a:fieldSet>
+            <script><![CDATA[
+            ]]></script>
+        </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/modules/prj/PRJ001/wh_train_project.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: ouyangzhaochang2663 $
+    $Date: 2011/02/21 08:37:47 $
+    $Revision: 1.13 $
+    $Purpose: UPDATE BY DJ 重构大部分代码
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure/>
+    <a:view>
+        <a:link id="pageLink_edit_user" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_edit.lview"/>
+        <a:link id="pageLink_set_password" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_set_password.lview"/>
+        <a:link id="pageLink_create_user" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_create.lview"/>
+        <a:link id="pageLink_role_assign" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_role_assign.lview"/>
+        <a:link id="project_submit_link_id" model="prj.PRJ001.wh_train_project" modelaction="execute"/>
+        <script><![CDATA[
+
+        function project_query() {
+            $('projectDs').query();
+        }
+
+        function project_create(){
+            new Leaf.Window({
+                id:'sys_user_create',
+                url:$('pageLink_create_user').getUrl(),
+                title:'${l:SYS_USER.ADD_NEW_USER}',
+                height:380,
+                width:530
+            });
+        }
+
+        function project_update(id){
+            new Leaf.Window({id:'sys_user_edit',
+                url:$('pageLink_edit_user').getUrl(),
+                params:{
+                    user_id:id
+                },
+                title:'${l:SYS_USER.EDIT_USER}',
+                height:380,
+                width:530
+            });
+        }
+
+        function winOpen_query_project(project_id){
+            new Leaf.Window({id:'sys_user_edit',
+                url:$('pageLink_edit_user').getUrl(),
+                params:{
+                    project_id:project_id
+                },
+                title:'项目查询',
+                height:380,
+                width:530
+            });
+        }
+
+        function project_number_renderer(value, record, name){
+            var project_id = record.get('project_id');
+            var project_number = record.get('project_number');
+            if(name=='project_number')
+            {
+                return '<a href="javascript:winOpen_query_project(\'' + project_id + '\');">' + value + '</a>';
+
+            }
+            return '';
+        }
+
+        function project_submit() {
+            var records=$('projectDs_grid').getSelected();
+            if(records.length!=1)
+            {
+                Leaf.showMessage('${l:PROMPT_MESSAGE}', '请选择一条记录');
+                return;
+            }
+            var record = records[0];
+            Leaf.showConfirm('确认','您确定提交审核吗？',function(){
+                Leaf.request({
+                    url:$('project_submit_link_id').getUrl(),
+                    para:{
+                        project_id:record.get('project_id')
+                    },
+                    success: function() {
+                        Leaf.SideBar.show({
+                            msg: '提交成功',
+                            duration: 2000
+                        });
+                        project_query();
+                    },
+                    scope: this
+                });
+            });
+        }
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="statusDs" loadData="true" lookupCode="项目列表"/>
+            <a:dataSet id="para_projectDs" autoCreate="true">
+                <a:fields>
+                    <a:field name="status_n" displayField="code_value_name" options="statusDs" returnField="status" valueField="code_value"/>
+                </a:fields>
+            </a:dataSet>
+            <a:dataSet id="projectDs" autoQuery="true" model="prj.PRJ001.wh_train_project" pageSize="15" queryDataSet="para_projectDs"/>
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:gridButton click="project_query" text="查询"/>
+                <a:gridButton click="project_create" text="新增"/>
+                <a:gridButton click="project_update" text="修改"/>
+                <a:gridButton click="project_submit" text="提交审批"/>
+            </a:screenTopToolbar>
+            <a:form column="4" labelWidth="100" title="HLS.QUERY_TITLE">
+                <a:textField name="project_number" bindTarget="para_projectDs" prompt="项目编码"/>
+                <a:numberField name="amount" bindTarget="para_projectDs" prompt="项目金额"/>
+                <a:comboBox name="status_n" bindTarget="para_projectDs" prompt="项目状态"/>
+            </a:form>
+            <a:grid id="projectDs_grid" bindTarget="projectDs" marginHeight="180" marginWidth="30" navBar="true">
+                <a:columns>
+                    <a:column name="project_number" prompt="项目编码" width="150"  renderer="project_number_renderer"/>
+                    <a:column name="amount" align="center" prompt="项目金额" renderer="Leaf.formatDate"/>
+                    <!--<a:column name="status_n" prompt="项目状态"/>-->
+                </a:columns>
+            </a:grid>
+        </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview

@@ -38,10 +38,10 @@
             $(grid_ds_id_total).setQueryParameter('vat_6_flag','N');
             $(grid_vat_6_ds_id_total).setQueryDataSet($(form_ds_id));
             $(grid_vat_6_ds_id_total).setQueryParameter('vat_6_flag','Y');
-            $(grid_ds_id_before).query();
+            /*$(grid_ds_id_before).query();
             $(grid_ds_id_before_6).query();
             $(grid_ds_id_current).query();
-            $(grid_ds_id_current_6).query();
+            $(grid_ds_id_current_6).query();*/
             Leaf.Masker.mask(detail_mask, '正在保存中。。。');
             Leaf.request({
                 url: $('process_vat_account_data_link').getUrl(),
@@ -52,6 +52,10 @@
                 success: function () {
                     $(grid_ds_id_total).query();
                     $(grid_vat_6_ds_id_total).query();
+                    $(grid_ds_id_before).query();
+                    $(grid_ds_id_before_6).query();
+                    $(grid_ds_id_current).query();
+                    $(grid_ds_id_current_6).query();
                     Leaf.Masker.unmask(detail_mask);
                 },
                 failure: function () {

src/main/webapp/modules/zjwfl/WFL2110/zj_wfl_workflow_deliver_condition.lview

@@ -14,7 +14,8 @@
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function () {
             var record = $('wfl_workflow_deliver_batch_create_ds').getAt(0);
-            if ('${/model/sys_user_employee_rp/record/@user_name}' != 'HAND' && '${/model/sys_user_employee_rp/record/@user_name}' != 'HL_ADMIN') {
+            //if ('${/model/sys_user_employee_rp/record/@user_name}' != 'HAND' && '${/model/sys_user_employee_rp/record/@user_name}' != 'HL_ADMIN') {
+            if ('${/model/sys_user_employee_rp/record/@role_admin_amount}' == '0' ) {
                 record.set('recipient_name', '${/model/sys_user_employee_rp/record/@employee_name}');
                 record.set('recipient_id', '${/model/sys_user_employee_rp/record/@user_id}');
                 record.getField('recipient_name').setReadOnly(true);