Merge branch 'feature/acr_invoice' into develop

src/main/database/Init/Sys_message/CREATED_BY_ERROR_MESSAGE.sql

-WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
-WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
-
-spool INITIALIZE_SYSCODE_CSH_TRANSACTION.log
-
-set feedback off
-set define off
-
-<!--系统代码取值-->
-
-BEGIN
-  sys_message_pkg.delete_message('CREATED_BY_ERROR');
-  sys_message_pkg.insert_message('CREATED_BY_ERROR','错误','确认人不能和开票人一样，请勿确认！','ZHS');
-END;
-
-
-commit;
-set feedback on
-set define on
-
-
-spool off
-
-exit
\ No newline at end of file

src/main/database/Register_function/ACR_INVOICE_CODITION_DETAILS.sql

-begin
---页面注册
-sys_function_assign_pkg.service_load('modules/acr/ACR510N/acr_invoice_condition_details.lview','销项发票创建明细',1,1,0);
---功能定义
-SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACR510NS','销项发票创建明细','销项发票创建明细','100','','','modules/acr/ACR510N/acr_invoice_condition_details.lview','ZHS',-1);
-SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACR510NS','销项发票创建明细','销项发票创建明细','100','','','modules/acr/ACR510N/acr_invoice_condition_details.lview','US',-1);
-
---分配页面
-sys_function_assign_pkg.func_service_load('ACR510NS','modules/acr/ACR510N/acr_invoice_condition_details.lview');
-
---分配bm
-sys_function_assign_pkg.func_bm_load('ACR510NS','acr.ACR510.acr_invoice_create');
-sys_function_assign_pkg.func_bm_load('ACR510NS','acr.ACR510.acr_invoice_create_lov');
-sys_function_assign_pkg.func_bm_load('ACR510NS','basic.sys_session_info');
-
-end;
-
-
-begin
-  sys_function_assign_pkg.service_load('modules/acr/ACR510/acr_invoice_create.lsc','销项发票创建明细',1,1,0);
-
-  sys_function_assign_pkg.func_service_load('ACR510NS','modules/acr/ACR510/acr_invoice_create.lsc');
-end;

src/main/database/Register_function/HLS_BP_MASTER_BILLING.sql

-begin
---页面注册
-sys_function_assign_pkg.service_load('modules/hls/HLS214N/hls_bp_master_billing.lview','商业伙伴开票维护',1,1,0);
---功能定义
-SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS214NS','商业伙伴开票维护','商业伙伴开票维护','100','','','modules/hls/HLS214N/hls_bp_master_billing.lview','ZHS',-1);
-SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS214NS','商业伙伴开票维护','商业伙伴开票维护','100','','','modules/hls/HLS214N/hls_bp_master_billing.lview','US',-1);
---分配页面
-sys_function_assign_pkg.func_service_load('HLS214NS','modules/hls/HLS214N/hls_bp_master_billing.lview');
-
-end;
-
-begin
---给父页面分配子页面
-  sys_function_assign_pkg.func_service_load('HLS214N','modules/hls/HLS214N/hls_bp_master_billing.lview');
-end;
\ No newline at end of file

src/main/database/Register_function/HLS_LEASE_ITEM_GPS_EXCEL_IMPORT.sql

-begin
---页面注册
-sys_function_assign_pkg.service_load('modules/hls/HLS204N/hls_lease_item_gps_excel_import.lview','租赁物GPS导入excel',1,1,0);
---分配父页面
-sys_function_assign_pkg.func_service_load('HLS204N','modules/hls/HLS204N/hls_lease_item_gps_excel_import.lview');
---分配bm
-sys_function_assign_pkg.func_bm_load('HLS204N','hls.HLS204N.hls_lease_item_gps_list_tmp');
-end;
\ No newline at end of file

src/main/database/Register_function/REGISTER_ACP522.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_ACP522.log
+
+set feedback off
+set define off
+
+begin
+  --页面注册
+  sys_function_assign_pkg.service_load('modules/acp/ACP522/ap_invoice_import.lview','进项发票导入',1,1,0);
+  --功能定义
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACP522','进项发票导入','进项发票导入','100','','','modules/acp/ACP522/ap_invoice_import.lview','ZHS',-1);
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACP522','进项发票导入','进项发票导入','100','','','modules/acp/ACP522/ap_invoice_import.lview','US',-1);
+  --分配页面
+  sys_function_assign_pkg.func_service_load('ACP522','modules/acp/ACP522/ap_invoice_import.lview');
+  --分配bm
+  sys_function_assign_pkg.func_bm_load('ACP522','cont.CON500.con_contract_get_layout_code');
+  --分配菜单
+  sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'ACP_INVOICE',p_function_code=>'ACP522',p_enabled_flag=>'Y',P_USER_ID=>-1);
+
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Register_function/REGISTER_ACP523.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_ACP523.log
+
+set feedback off
+set define off
+
+begin
+  --页面注册
+  sys_function_assign_pkg.service_load('modules/acp/ACP523/ap_invoice_confirm.lview','进项发票导入确认',1,1,0);
+  --功能定义
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACP523','进项发票导入确认','进项发票导入确认','100','','','modules/acp/ACP523/ap_invoice_confirm.lview','ZHS',-1);
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACP523','进项发票导入确认','进项发票导入确认','100','','','modules/acp/ACP523/ap_invoice_confirm.lview','US',-1);
+  --分配页面
+  sys_function_assign_pkg.func_service_load('ACP523','modules/acp/ACP523/ap_invoice_confirm.lview');
+
+  --分配菜单
+  sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'ACP_INVOICE',p_function_code=>'ACP523',p_enabled_flag=>'Y',P_USER_ID=>-1);
+
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Register_function/REGISTER_ACR510NS.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_ACR510NS.log
+
+set feedback off
+set define off
+
+begin
+  --页面注册
+  sys_function_assign_pkg.service_load('modules/acr/ACR510N/acr_invoice_condition_details.lview','销项发票创建明细',1,1,0);
+  sys_function_assign_pkg.service_load('modules/acr/ACR510/acr_invoice_create.lsc','销项发票创建明细',1,1,0);
+
+  --功能定义
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACR510NS','销项发票创建明细','销项发票创建明细','100','','','modules/acr/ACR510N/acr_invoice_condition_details.lview','ZHS',-1);
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACR510NS','销项发票创建明细','销项发票创建明细','100','','','modules/acr/ACR510N/acr_invoice_condition_details.lview','US',-1);
+
+  --分配页面
+  sys_function_assign_pkg.func_service_load('ACR510NS','modules/acr/ACR510N/acr_invoice_condition_details.lview');
+  sys_function_assign_pkg.func_service_load('ACR510NS','modules/acr/ACR510/acr_invoice_create.lsc');
+
+  --分配bm
+  sys_function_assign_pkg.func_bm_load('ACR510NS','acr.ACR510.acr_invoice_create');
+  sys_function_assign_pkg.func_bm_load('ACR510NS','acr.ACR510.acr_invoice_create_lov');
+  sys_function_assign_pkg.func_bm_load('ACR510NS','basic.sys_session_info');
+
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Register_function/REGISTER_ACR516.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_ACR516.log
+
+set feedback off
+set define off
+
+begin
+--页面注册
+sys_function_assign_pkg.service_load('modules/acr/ACR516/acr_invoice_claim_application.lview','发票认领申请',1,1,0);
+--功能定义
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACR516','发票认领申请','发票认领申请','100','','','modules/acr/ACR516/acr_invoice_claim_application.lview','ZHS',-1);
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('ACR516','发票认领申请','发票认领申请','100','','','modules/acr/ACR516/acr_invoice_claim_application.lview','US',-1);
+--分配页面
+sys_function_assign_pkg.func_service_load('ACR516','modules/acr/ACR516/acr_invoice_claim_application.lview');
+--分配菜单
+sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'ACR_INVOICE',p_function_code=>'ACR516',p_enabled_flag=>'Y',P_USER_ID=>-1);
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Register_function/HLS_LEASE_ITEM_GPS_MODIFY_ENTR.sql → src/main/database/Register_function/REGISTER_HLS204N.sql

 WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
 WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
 
-spool HLS_LEASE_ITEM_GPS_MODIFY_ENTR.log
+spool REGISTER_HLS204N.log
 
 set feedback off
 set define off
@@ -9,13 +9,16 @@ set define off
 begin
 --页面注册
 sys_function_assign_pkg.service_load('modules/hls/HLS204N/hls_lease_item_gps_modify_entrance.lview','租赁物GPS信息管理',1,1,0);
+sys_function_assign_pkg.service_load('modules/hls/HLS204N/hls_lease_item_gps_excel_import.lview','租赁物GPS导入excel',1,1,0);
+
 --功能定义
 SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS204N','租赁物GPS信息管理','租赁物GPS信息管理','100','','','modules/hls/HLS204N/hls_lease_item_gps_modify_entrance.lview','ZHS',-1);
 SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS204N','租赁物GPS信息管理','租赁物GPS信息管理','100','','','modules/hls/HLS204N/hls_lease_item_gps_modify_entrance.lview','US',-1);
 --分配页面
 sys_function_assign_pkg.func_service_load('HLS204N','modules/hls/HLS204N/hls_lease_item_gps_modify_entrance.lview');
+sys_function_assign_pkg.func_service_load('HLS204N','modules/hls/HLS204N/hls_lease_item_gps_excel_import.lview');
 --分配bm
---sys_function_assign_pkg.func_bm_load('功能名称','rent_m_s.RENT_M_S.hou_inf_query');
+sys_function_assign_pkg.func_bm_load('HLS204N','hls.HLS204N.hls_lease_item_gps_list_tmp');
 --分配菜单
 sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'BP_MANAGEMENT',p_function_code=>'HLS204N',p_enabled_flag=>'Y',P_USER_ID=>-1);
 

src/main/database/Register_function/HLS_LEASE_ITEM_GPS_IMPORT.sql → src/main/database/Register_function/REGISTER_HLS204NS.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_HLS204NS.log
+
+set feedback off
+set define off
 
 begin
 --页面注册
@@ -10,3 +17,12 @@ sys_function_assign_pkg.func_service_load('HLS204NS','modules/hls/HLS204N/hls_le
 --分配父页面
 sys_function_assign_pkg.func_service_load('HLS204N','modules/hls/HLS204N/hls_lease_item_gps_import.lview');
 end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Register_function/REGISTER_HLS214NS.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_HLS214NS.log
+
+set feedback off
+set define off
+
+begin
+  --页面注册
+  sys_function_assign_pkg.service_load('modules/hls/HLS214N/hls_bp_master_billing.lview','商业伙伴开票维护',1,1,0);
+  --功能定义
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS214NS','商业伙伴开票维护','商业伙伴开票维护','100','','','modules/hls/HLS214N/hls_bp_master_billing.lview','ZHS',-1);
+  SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS214NS','商业伙伴开票维护','商业伙伴开票维护','100','','','modules/hls/HLS214N/hls_bp_master_billing.lview','US',-1);
+  --分配页面
+  sys_function_assign_pkg.func_service_load('HLS214NS','modules/hls/HLS214N/hls_bp_master_billing.lview');
+  --给父页面分配子页面
+  sys_function_assign_pkg.func_service_load('HLS214N','modules/hls/HLS214N/hls_bp_master_billing.lview');
+
+end;
+
+
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/webapp/modules/acp/ACP523/ap_invoice_confirm.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
+          trace="true">
+    <a:view>
+        <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
+                modelaction="update"/>
+        <script><![CDATA[
+
+            ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>
\ No newline at end of file