Merge branch 'refs/heads/feature/email' into develop

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_excel_report_static.lwm

@@ -9,15 +9,16 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            select *
-  from (select count(*) total_number,
-               sum(nvl(v.amount, 0)) sum_amount,
+          select *
+  from (       select count(*) total_number,
+               sum(nvl(c.lease_item_amount, 0)) sum_amount,
                sum(nvl(v.amount_agent, 0)) sum_amount_agent,
                sum(nvl(v.amount_vender, 0)) sum_amount_vender,
                sum(nvl(v.other_payment2, 0)) sum_other_payment,
                to_char(sysdate, 'yyyy') || '年' || to_char(sysdate, 'mm') || '月' purchase_date
-          from csh_payment_req_ln v
-           #WHERE_CLAUSE#
+          from csh_payment_req_ln v,con_contract c
+          WHERE v.ref_doc_id=c.contract_id
+            AND v.payment_req_id=${@payment_req_id}
           ) v
 
 

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm

@@ -9,7 +9,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-             select rownum, v.*
+     select rownum, v.*
   from (select c.contract_number,
                c.contract_name,
                c.contract_id,
@@ -91,6 +91,7 @@
                   from hls_bp_master_bank_account hbm
                  where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_name,
                cpr.amount,
+               c.lease_item_amount,
                --首付款抵充金额
                (select nvl(hd.other_payment2, 0)
                   from hls_fin_calculator_hd hd

src/main/webapp/WEB-INF/classes/csh/CSH502/csh_payment_req_query.lwm

@@ -9,8 +9,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-
-SELECT v.*
+           SELECT v.*
   FROM( SELECT t.*
      FROM (SELECT h.payment_req_number,
                   h.document_type,
@@ -157,19 +156,13 @@ SELECT v.*
                      FROM csh_payment_req_ln a
                     WHERE a.payment_req_id = h.payment_req_id
                       AND a.payment_status <> 'FULL')
-              AND h.company_id IN
-                  (SELECT company_id
-                     FROM fnd_companies
-                    START WITH company_id = 1
-                   CONNECT BY prior company_id = parent_biz_company_id)
-                   ) t
-            WHERE t.bp_id_agent_n IN  (
-                 select h.bp_name
-                      from exp_emp_assign_e_v ee, hls_bp_master h
-                     where ee.user_id = ${/session/@user_id}
-                       and ee.unit_id = h.unit_id
-                       and h.bp_category = 'AGENT'
-            )
+              AND EXISTS  (
+                    SELECT 1
+                      FROM exp_emp_assign_e_v e
+                      WHERE e.user_id=${/session/@user_id}
+                      AND e.position_code IN (012)
+                  )
+                   )t
             )v
             #WHERE_CLAUSE#
     ORDER BY v.req_date DESC, v.payment_req_number DESC
@@ -212,8 +205,8 @@ SELECT v.*
     </bm:query-fields>
     <bm:features>
         <s:bm-script><![CDATA[
-        var cx = Packages.leaf.javascript.Context.getCurrentContext();
-        Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
-    ]]></s:bm-script>
+            var cx = Packages.leaf.javascript.Context.getCurrentContext();
+            Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
+        ]]></s:bm-script>
     </bm:features>
 </bm:model>

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

@@ -11,6 +11,8 @@
         <ns1:field name="user_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" prompt="用户代码"/>
         <ns1:field name="employee_id"/>
         <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:fields>
     <ns1:query-fields>
         <ns1:query-field field="user_name" queryOperator="like"/>

src/main/webapp/WEB-INF/leaf.plugin.export.word/payment_apply_content.xml

@@ -116,7 +116,7 @@
 				</tc>
 
 				<tc width="4">
-					<p align="center"><t fontSize="20" fontFamily="宋体">${detail_item_l.getString('amount')!''}</t></p>
+					<p align="center"><t fontSize="20" fontFamily="宋体">${detail_item_l.getString('lease_item_amount')!''}</t></p>
 				</tc>
 
 				<tc width="4">

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

@@ -345,7 +345,7 @@
                 <!--</a:lov>-->
                 <!--<a:textField name="bp_name" bindTarget="csh_payment_req_query_ds" prompt="付款对象"/>-->
                <!-- <a:textField name="times_from" bindTarget="csh_payment_req_query_ds" prompt="期次从"/>-->
-                <a:lov name="cf_item_desc" bindTarget="csh_payment_req_query_ds" prompt="现金流类型"/>
+<!--                <a:lov name="cf_item_desc" bindTarget="csh_payment_req_query_ds" prompt="现金流类型"/>-->
                 <a:datePicker name="due_date_from" bindTarget="csh_payment_req_query_ds" prompt="应付日期从"/>
                 <a:datePicker name="due_date_to" bindTarget="csh_payment_req_query_ds" prompt="应付日期到"/>
                 <a:comboBox name="vender_name_n"  bindTarget="csh_payment_req_query_ds" prompt="厂商"/>

src/main/webapp/modules/csh/CSH502/csh_payment_req_query.lview

@@ -8,7 +8,7 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application">
     <a:init-procedure/>
     <a:view>
-        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH502"/>
+        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=PAYMENT_REQ&amp;function_code=CSH502"/>
         <a:link id="payment_req_post_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_insert_tmp.lsc"/>
         <a:link id="payment_req_excel_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets.lsc"/>
         <a:link id="payment_req_excel_cib_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets_cib.lsc"/>

src/main/webapp/modules/zjwfl/ZJWFL1090/zj_sys_notify_template_ln.lview

@@ -44,6 +44,8 @@
                         <a:mapping>
                             <a:map from="employee_name" to="employee_name"/>
                             <a:map from="employee_id" to="employee_id"/>
+                            <a:map from="email" to="email"/>
+                            <a:map from="mobil" to="mobil"/>
                         </a:mapping>
                     </a:field>
                     <a:field name="enabled_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>