发票创建新增收据类型

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

@@ -36,10 +36,11 @@
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE"/>
         <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
         <bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
-		<bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE"/>
+        <bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE"/>
         <bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/>
         <bm:field name="full_elec_invoice_flag"/>
-		<bm:field name="full_elec_invoice_flag_n"/>
+        <bm:field name="full_elec_invoice_flag_n"/>
+        <bm:field name="business_type" />
     </bm:fields>
     <bm:operations>
         <bm:operation name="query">
@@ -68,6 +69,7 @@
                        con.project_id,
                        con.project_number,
                        con.project_name,
+                       con.business_type,
                        t.invoice_kind,
                        (SELECT v.code_value_name
                           FROM sys_code_values_v v
@@ -95,10 +97,9 @@
                         from sys_code_values_v v
                         where v.code = 'ACR512_INVOICE_KIND_TYPE'
                         and v.code_value = t.invoice_kind_type) invoice_kind_type_n,
-					t.full_elec_invoice_flag,
-					(select v.code_value_name value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t.full_elec_invoice_flag) full_elec_invoice_flag_n
-
-                  FROM acr_invoice_create_tmp t, con_contract_v con,hls_bp_master t1
+                        t.full_elec_invoice_flag,
+                       (select v.code_value_name value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t.full_elec_invoice_flag) full_elec_invoice_flag_n
+           FROM acr_invoice_create_tmp t, con_contract_v con,hls_bp_master t1
                  WHERE t.session_id = ${/session/@session_id}
                    AND t.contract_id = con.contract_id
                    and t1.bp_id = t.bp_id
@@ -111,7 +112,7 @@
 				begin
 				  ACR_INVOICE_PKG.invoiceTmp_update(p_record_id				=> ${@record_id},
 						                            p_invoice_kind          => ${@invoice_kind},
-													 p_invoice_kind_type     => ${@invoice_kind_type},
+                                                    p_invoice_kind_type     => ${@invoice_kind_type},
 						                            p_tax_amount            => ${@tax_amount},
 						                            p_billing_amount  		=> ${@billing_amount},
 						                            p_product_name          => ${@product_name},

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

@@ -43,6 +43,7 @@
 
         function createScreen_create()
         {
+            debugger;
             var message_flag =false;
             var win = $('acr_invoice_create_invoice');
             var ds=$('headDs');
@@ -73,11 +74,11 @@
                 //add by gzj 售后回租只能开普票
                 var business_type= selectedDs[i].get('business_type');
                 var kind_type=selectedDs[i].get('invoice_kind_type');
-                if(business_type=='LEASEBACK'&&(kind_type!='PAPER_GENERAL'&&kind_type!='ELECTRONIC_GENERAL')){
+                if(business_type=='LEASEBACK'&&(kind_type!='PAPER_GENERAL'&&kind_type!='ELECTRONIC_GENERAL'&&kind_type!='RECEIPT')){
                    Leaf.showMessage("提示","售后回租只能开普通发票!");
                     return;
                 }
-                if(business_type=='LEASEBACK'&&kind_type!='ELECTRONIC_GENERAL'){
+                if(business_type=='LEASEBACK'&&(kind_type!='ELECTRONIC_GENERAL'&&kind_type!='RECEIPT')){
                     message_flag =true;
                     // Leaf.showMessage("提示","回租建议选择增值税电子普票!");
                 }
@@ -149,6 +150,11 @@
                 if (records[i].get('invoice_kind') && records[i].get('invoice_kind')=='RECEIPT' && records[i].get('cf_item') && records[i].get('cf_item')=='51') {
                     records[i].set('product_name','保证金');
                 }
+                if(records[i].get('invoice_kind_type')=='RECEIPT'){
+                    records[i].getField('invoice_kind_type').setReadOnly(true);
+                    records[i].getField('invoice_kind_type_n').setReadOnly(true);
+
+                }
             }
         }
 		

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

@@ -45,6 +45,8 @@
         {
             var win = $('acr_invoice_create_invoice');
             var ds=$('headDs');
+            var message_flag =false;
+            debugger
             if(!ds.validate(true))
             {
                 Leaf.Masker.unmask(Ext.getBody());
@@ -67,13 +69,30 @@
                     $L.showErrorMessage("提示","开票金额填写有误！");
                     return;
                 }
+                //add by gzj 售后回租只能开普票
+                var business_type= selectedDs[i].get('business_type');
+                var kind_type=selectedDs[i].get('invoice_kind_type');
+                if(business_type=='LEASEBACK'&&(kind_type!='PAPER_GENERAL'&&kind_type!='ELECTRONIC_GENERAL'&&kind_type!='RECEIPT')){
+                    Leaf.showMessage("提示","售后回租只能开普通发票!");
+                    return;
+                }
+                if(business_type=='LEASEBACK'&&(kind_type!='ELECTRONIC_GENERAL'&&kind_type!='RECEIPT')){
+                    message_flag =true;
+                    // Leaf.showMessage("提示","回租建议选择增值税电子普票!");
+                }
 
 
 
             }
 
             var datas = ds.getJsonData();
-            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
+            var message_info;
+            if(message_flag==false){
+                message_info= '是否确认开票？';
+            }else {
+                message_info= "回租建议选择增值税电子普票!是否确认开票？";
+            }
+            Leaf.showConfirm('${l:HLS.PROMPT}',message_info,function()
             {
 
                 Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');