Merge branch 'feature/月结功能修改' into develop

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm

@@ -127,7 +127,7 @@
                           (SELECT MIN(ccc.due_date)
                            FROM con_contract_cashflow ccc
                            WHERE ccc.contract_id = cc.contract_id
-                                 --AND ccc.overdue_status = 'Y'
+                                 AND ccc.due_amount > 0
                                  AND ccc.due_date <= sysdate
                                  AND ccc.cf_item in (1, 8, 9)
                                  AND ccc.write_off_flag <> 'FULL')                                 min_overdue_date,

src/main/webapp/WEB-INF/classes/hls/HLS801/csh_current_period_query.lwm

@@ -61,9 +61,12 @@
 		<bm:operation name="execute">
 			<bm:update-sql><![CDATA[
             	begin
-					hls_monthend_new_pkg.csh_check_acr(p_user_id   => ${/session/@user_id});
+					hls_monthend_new_pkg.csh_check_acr(p_user_id   => ${/session/@user_id},p_err_msg=> ${@p_err_msg});
             	end;
             ]]></bm:update-sql>
+			<bm:parameters>
+				<bm:parameter name="p_err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@p_err_msg"/>
+			</bm:parameters>
 		</bm:operation>
 	</bm:operations>
 </bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS801/delete_tax_confirm_temp_data.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: qwm  
+    $Date: 2014-1-3 下午1:05:14  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+
+               begin
+					hls_monthend_new_pkg.delete_tax_confrim_temp_data(
+                                    p_user_id   => ${/session/@user_id},
+                                    p_session_id=>${/session/@session_id}
+                                   );
+            	end;
+]]></bm:update-sql>
+        </bm:operation>
+
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS801/hls_tax_act_confirm.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_TAX_ACT_CONFIRM" needAccessControl="false">
+	<bm:fields>
+		<bm:field name="act_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="ACT_ID" prompt="HLS_TAX_ACT_CONFIRM.ACT_ID"/>
+		<bm:field name="cashflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CASHFLOW_ID" prompt="HLS_TAX_ACT_CONFIRM.CASHFLOW_ID"/>
+		<bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID" prompt="HLS_TAX_ACT_CONFIRM.CONTRACT_ID"/>
+		<bm:field name="cf_item" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CF_ITEM" prompt="HLS_TAX_ACT_CONFIRM.CF_ITEM"/>
+		<bm:field name="cf_type" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CF_TYPE" prompt="HLS_TAX_ACT_CONFIRM.CF_TYPE"/>
+		<bm:field name="times" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TIMES" prompt="HLS_TAX_ACT_CONFIRM.TIMES"/>
+		<bm:field name="due_date" databaseType="DATE" datatype="java.util.Date" physicalName="DUE_DATE" prompt="HLS_TAX_ACT_CONFIRM.DUE_DATE"/>
+		<bm:field name="due_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="DUE_AMOUNT" prompt="HLS_TAX_ACT_CONFIRM.DUE_AMOUNT"/>
+		<bm:field name="vat_due_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="VAT_DUE_AMOUNT" prompt="HLS_TAX_ACT_CONFIRM.VAT_DUE_AMOUNT"/>
+		<bm:field name="received_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="RECEIVED_AMOUNT" prompt="HLS_TAX_ACT_CONFIRM.RECEIVED_AMOUNT"/>
+		<bm:field name="last_received_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_RECEIVED_DATE" prompt="HLS_TAX_ACT_CONFIRM.LAST_RECEIVED_DATE"/>
+		<bm:field name="full_write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="FULL_WRITE_OFF_DATE" prompt="HLS_TAX_ACT_CONFIRM.FULL_WRITE_OFF_DATE"/>
+		<bm:field name="period_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_NAME" prompt="HLS_TAX_ACT_CONFIRM.PERIOD_NAME"/>
+		<bm:field name="tax_create_je_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TAX_CREATE_JE_FLAG" prompt="HLS_TAX_ACT_CONFIRM.TAX_CREATE_JE_FLAG"/>
+		<bm:field name="batch_je_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BATCH_JE_ID" prompt="HLS_TAX_ACT_CONFIRM.BATCH_JE_ID"/>
+		<bm:field name="contract_number" expression="(select cc.contract_number from  con_contract cc where cc.contract_id=t1.contract_id)"/>
+		<bm:field name="cf_item_n" expression="(select ct.description from hls_cashflow_item ct where ct.cf_item=t1.cf_item)"/>
+	</bm:fields>
+	<bm:features>
+		<f:standard-who/>
+		<o:sequence-pk/>
+	</bm:features>
+	<bm:primary-key>
+		<bm:pk-field name="act_id"/>
+	</bm:primary-key>
+	<bm:query-fields>
+		<bm:query-field name="period_name" queryExpression="t1.period_name = ${@period_name}"/>
+	</bm:query-fields>
+	<bm:data-filters>
+		<bm:data-filter name="period_name" enforceOperations="query" expression="t1.period_name =  ${@period_name}"/>
+	</bm:data-filters>
+	<bm:operations>
+		<bm:operation name="update">
+			<bm:update-sql><![CDATA[
+            	begin
+					hls_monthend_new_pkg.insert_tax_confirm_data(
+									p_first_flag => ${@first_flag},
+                                    p_period_name  => ${@period_name},
+                                    p_calc_end_date   => to_date(${@calc_end_date},'yyyy-mm-dd'),
+                                    p_user_id   => ${/session/@user_id}
+                                   );
+            	end;
+            ]]></bm:update-sql>
+		</bm:operation>
+		<bm:operation name="execute">
+			<bm:update-sql><![CDATA[
+            	begin
+					hls_monthend_new_pkg.refresh_tax_confirm_data(
+                                    p_period_name  => ${@period_name},
+                                    p_calc_end_date   => to_date(${@calc_end_date},'yyyy-mm-dd'),
+                                    p_user_id   => ${/session/@user_id}
+                                   );
+            	end;
+            ]]></bm:update-sql>
+		</bm:operation>
+	</bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS801/tax_confirm.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: qwm  
+    $Date: 2014-1-3 下午1:05:14  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+
+               begin
+					hls_monthend_new_pkg.insert_tax_confrim_temp(
+                                    p_act_id  => ${@act_id},
+                                    p_cashflow_id  => ${@cashflow_id},
+                                    p_user_id   => ${/session/@user_id},
+                                    p_session_id=>${/session/@session_id}
+                                   );
+            	end;
+]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+            	
+             begin
+					hls_monthend_new_pkg.advance_tax_je_create(
+                                    p_user_id   => ${/session/@user_id},
+                                    p_session_id=>${/session/@session_id},
+                                    p_company_id=>${/session/@company_id},
+                                    p_period_name  => ${@period_name},
+                                    p_calc_end_date   => to_date(${@calc_end_date},'yyyy-mm-dd')
+                                   );
+            	end;
+]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

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

@@ -121,7 +121,7 @@ SELECT h.period_year,
            AND hi.vat_interface_status = 'BACK'
            AND  to_char(hi.invoice_date,'yyyymm') <= ${@base_period}
            AND (li.cashflow_id = l.cashflow_id OR
-               li.ref_n03 = l.journal_header_id))
+               li.ref_n04 = l.journal_line_id))
   UNION
         select vl.*
           from ET_VAT_JOURNAL_LV vl

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

@@ -121,7 +121,7 @@ SELECT h.period_year,
            AND hi.vat_interface_status = 'BACK'
            AND  to_char(hi.invoice_date,'yyyymm') < ${@base_period}
            AND (li.cashflow_id = l.cashflow_id OR
-               li.ref_n03 = l.journal_header_id))
+               li.ref_n04 = l.journal_line_id))
   UNION
         select vl.*
           from ET_VAT_JOURNAL_LV vl
@@ -228,14 +228,16 @@ SELECT h.period_year,
         </bm:operation>
     </bm:operations>
     <bm:data-filters>
-        <bm:data-filter enforceOperations="query" expression="t1.journal_date &lt;= add_months(last_day(to_date(${@base_period},'yyyymm')),-1)"/>
+        <bm:data-filter enforceOperations="query"
+                        expression="t1.journal_date &lt;= add_months(last_day(to_date(${@base_period},'yyyymm')),-1)"/>
         <bm:data-filter enforceOperations="query" expression="t1.amount_tax > 0"/>
     </bm:data-filters>
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
         <bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/>
         <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>
-        <bm:query-field name="base_period" queryExpression="to_number(to_char(t1.journal_date,'yyyymm')) &lt; to_number(${@base_period})"/>
+        <bm:query-field name="base_period"
+                        queryExpression="to_number(to_char(t1.journal_date,'yyyymm')) &lt; to_number(${@base_period})"/>
         <bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/modules/cont/CON7000/con_rent_trans_penalty_create_detail.lview

@@ -62,7 +62,7 @@
 
         function con7000_submit() {
             var hd_record = $('con_rent_trans_penalty_hd_ds').getAt(0);
-            var gld_record = $('con_rent_trans_penalty_hd_ds').getAll();
+            var gld_record = $('con7000_gld_write_off_ds').getAll();
             if (gld_record.length < 1) {
                 Leaf.showMessage('提示', '罚息调整数据不能为空！');
                 return;

src/main/webapp/modules/hls/HLS801/tax_confirm.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-update model="hls.HLS801.delete_tax_confirm_temp_data"/>
+        <batch-apply sourcepath="/parameter/details">
+            <a:model-update model="hls.HLS801.tax_confirm"/>
+        </batch-apply>
+        <a:model-execute model="hls.HLS801.tax_confirm"/>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>