【fix】修改销项发票字段

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_penalty_create.lwm

@@ -41,53 +41,51 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            	select t.cashflow_id,
-				       t.record_id,
-				       t.billing_object,
-				       (select c.code_value_name
-				          from sys_code_values_v c
-				         where c.code = 'ACR510_BILL_DETAIL_METHOD'
-				           and c.code_value = t.billing_object) as billing_object_desc,
-				         (select m.bp_name
-          from hls_bp_master_s_v m
-         where m.bp_id =t.bp_id) billing_object_name,
-				       t.due_amount,
-				       --本次开票金额
-				       t.due_amount received_amount,
-				       t.due_amount billing_amount,
-				       0 cf_billing_amount,
-				       t.contract_id,
-				       con.contract_number,
-				       con.contract_name,
-				       con.project_id,
-				       con.project_number,
-				       con.project_name,
-				       t.invoice_kind,
-				       (select v.code_value_name
-				          from sys_code_values_v v
-				         where v.code = 'ACR510_INVOICE_KIND'
-				           and v.code_value = t.invoice_kind) as invoice_kind_desc,
-				       t.currency,
-				       (select c.currency_name
-						  from gld_currency_vl c
-						 where c.currency_code = t.currency) as currency_desc,
-				       1 as exchange_rate,
-				       'MANUAL' as exchange_rate_type,
-				       (select v.rate_type_desc
-				          from gld_exchange_rate_type_v v
-				         where v.rate_type_code = 'MANUAL') as exchange_rate_type_desc,
-                       to_char(cf.transaction_date,'yyyy-mm-dd')transaction_date,
-				       t.cf_item,
-				       t.tax_amount,
-				       '违约金' cf_item_desc,
-				       '融资租赁费' as product_name
-				  from acr_invoice_create_tmp      t,
-				       con_contract_v              con,
-				       ACR_INVOICE_PENALTY_V  cf
-				 where t.session_id = ${/session/@session_id}
-				   and t.contract_id = con.contract_id
-				   and t.contract_id = cf.contract_id
-				 order by con.contract_id,t.cf_item
+            	SELECT t.cashflow_id,
+                       t.record_id,
+                       t.billing_object,
+                       (SELECT c.code_value_name
+                          FROM sys_code_values_v c
+                         WHERE c.code = 'ACR510_BILL_DETAIL_METHOD'
+                           AND c.code_value = t.billing_object) AS billing_object_desc,
+                       (SELECT m.bp_name FROM hls_bp_master_s_v m WHERE m.bp_id = t.bp_id) billing_object_name,
+                       t.due_amount,
+                       --本次开票金额
+                       t.due_amount received_amount,
+                       t.due_amount billing_amount,
+                       0 cf_billing_amount,
+                       t.contract_id,
+                       con.contract_number,
+                       con.contract_name,
+                       con.project_id,
+                       con.project_number,
+                       con.project_name,
+                       t.invoice_kind,
+                       (SELECT v.code_value_name
+                          FROM sys_code_values_v v
+                         WHERE v.code = 'ACR510_INVOICE_KIND'
+                           AND v.code_value = t.invoice_kind) AS invoice_kind_desc,
+                       t.currency,
+                       (SELECT c.currency_name
+                          FROM gld_currency_vl c
+                         WHERE c.currency_code = t.currency) AS currency_desc,
+                       1 AS exchange_rate,
+                       'MANUAL' AS exchange_rate_type,
+                       (SELECT v.rate_type_desc
+                          FROM gld_exchange_rate_type_v v
+                         WHERE v.rate_type_code = 'MANUAL') AS exchange_rate_type_desc,
+                       (SELECT cf.transaction_date
+                          FROM hls_journal_detail cf
+                         WHERE cf.journal_line_id = t.journal_line_id) transaction_date,
+
+                       t.cf_item,
+                       t.tax_amount,
+                       '违约金' cf_item_desc,
+                       '融资租赁费' AS product_name
+                  FROM acr_invoice_create_tmp t, con_contract_v con
+                 WHERE t.session_id = ${/session/@session_id}
+                   AND t.contract_id = con.contract_id
+                 ORDER BY con.contract_id, t.cf_item
 			]]></bm:query-sql>
         </bm:operation>
 

src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview

@@ -195,7 +195,7 @@
                                 <a:column name="cf_item_desc"/>
                                 <a:column name="contract_name" width="200"/>
                                 <a:column name="project_number" width="150" prompt="报单编号"/>
-                                <a:column name="project_name" width="200" prompt="报单名称"/>
+<!--                                <a:column name="project_name" width="200" prompt="报单名称"/>-->
                                 <a:column name="last_received_date" renderer="Leaf.formatDate" width="80"/>
                              <!--   <a:column name="exchange_rate" align="right"/>
                                 <a:column name="exchange_rate_type_desc"/>-->

src/main/webapp/modules/acr/ACR510/acr_invoice_penalty_invoice.lview

@@ -189,7 +189,7 @@
                                 <a:column name="cf_item_desc"/>
                                 <a:column name="contract_name" width="200"/>
                                 <a:column name="project_number" width="150" prompt="报单编号"/>
-                                <a:column name="project_name" width="200" prompt="报单名称"/>
+<!--                                <a:column name="project_name" width="200" prompt="报单名称"/>-->
                                 <a:column name="transaction_date" renderer="Leaf.formatDate" width="80" prompt="收款日期"/>
                              <!--   <a:column name="exchange_rate" align="right"/>
                                 <a:column name="exchange_rate_type_desc"/>-->