anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

税率维护添加租赁类型

Browse Source
This commit is contained in:
tangfutang 2020-12-11 14:16:59 +08:00
parent 7e18aef1c3
commit 6bab97b12d
6 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/TaxCodeInfo.jsp
View File

@ -40,7 +40,7 @@
<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%>
<%
String sButtons[][] = {
{"true","All","Button","±£´æ","±£´æ","as_save(0)","","","","btn_icon_save"},
{"true","All","Button","±£´æ","±£´æ","as_save(0,'parent.AsDialog.ClosePage()')","","","","btn_icon_save"},
{"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"}
};
sButtonPosition = "south";

1
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -4250,6 +4250,7 @@
<attribute name="full_code" label="合并编码" type="STRING"/>
<attribute name="tax_type" label="名称" type="STRING"/>
<attribute name="remark" label="简称" type="STRING"/>
<attribute name="lease_form" label="租赁类型01直租，02回租" type="STRING"/>
</attributes>
<manager>
<managerProperties>

28
src/com/amarsoft/app/awe/config/classmethod/TaxCodeInfoHandler.java Normal file
View File

@ -0,0 +1,28 @@
package com.amarsoft.app.awe.config.classmethod;
import jbo.app.tenwa.calc.TAX_CODE_INFO;
import com.amarsoft.are.ARE;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.JBOException;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.dw.handler.impl.CommonHandler;
public class TaxCodeInfoHandler extends CommonHandler {
@Override
protected boolean validityCheck(BizObject bo, boolean isInsert) {
try {
BizObject tci=JBOFactory.createBizObjectQuery(TAX_CODE_INFO.CLASS_NAME," tax_type=:tax_type and lease_form=:lease_form").setParameter("tax_type", bo.getAttribute("tax_type").getString()).setParameter("lease_form", bo.getAttribute("lease_form").getString()).getSingleResult(false);
if(tci!=null && (isInsert || !bo.getAttribute("id").getString().equals(tci.getAttribute("id").getString()))){
errors = "该名称在对应的类型形式已存在！！！";
return false;
}
} catch (JBOException e) {
ARE.getLog().debug(e);
errors = e.getMessage();
return false;
}
return true;
}
}

4
src_jbo/jbo/app/tenwa/calc/TAX_CODE_INFO.java
View File

@ -33,4 +33,8 @@ public interface TAX_CODE_INFO{
* ¼ò³Æ STRING(20)<br>
*/
public static final String remark = "remark";
/**
* 租赁类型01直租，02回租 STRING(20)<br>
*/
public static final String lease_form = "lease_form";
}

6
src_sql/procedure/PROC_calc_tax_tj.sql
View File

@ -33,7 +33,7 @@ BEGIN
`vib`.`invoice_money` AS `invoice_money`,
`cl`.`itemname` AS `tax_type`,
`vib`.`tax_no` AS `tax_no`,
`tci`.`code` AS `tax_code`,
case lci.leas_form when '02' then `tci`.`code` when '01' then `tci1`.`code` end AS `tax_code`,
`ca`.`CERTID` AS `cert_id`,
`ca`.`account` AS `account`,
`ca`.`acc_number` AS `acc_number`,
@ -54,7 +54,9 @@ FROM (((((((`apzl`.`vi_li_invoice_tj_base` `vib`
ON (((`cl`.`codeno` = 'tax_type')
AND (`cl`.`itemno` = `vib`.`tax_no`))))
LEFT JOIN `apzl`.`tax_code_info` `tci`
ON ((`tci`.`tax_type` = `cl`.`itemno`)))
ON ((`tci`.`tax_type` = `cl`.`itemno` and tci.`lease_form`='02'))
LEFT JOIN `apzl`.`tax_code_info` `tci1` on `tci1`.`tax_type` = `cl`.`itemno` and tci1.`lease_form`='01'
)
WHERE ((`vib`.`tax_no` IN('rent','interest','penalty','feetype1','feetype4','feetype30'))
)
;

30
src_sql/投产SQL/v20201022/tft_20201022.sql
View File

@ -201,4 +201,32 @@ CREATE TABLE bank_collect_type_config_log (
inputtime varchar(20) DEFAULT NULL COMMENT '登记时间'
) ENGINE=InnoDB DEFAULT CHARSET=gbk;
delee from AWE_DO_CATALOG where dono='BankCollectTypeConfigInfo';
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('BankCollectTypeConfigInfo','ÒøÐпۿʽÅäÖÃ',null,'30020',null,'1','1','default','jbo.loan.BANK_COLLECT_TYPE_CONFIG','O','id=:id','','','com.amarsoft.app.awe.config.customer.CustomerAccountConfigHandler',null,'SYS_Designer','2020/10/22 11:42:42','SYS_Designer','2020/12/10 14:36:40','','0','');
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('BankCollectTypeConfigInfo','银行扣款方式配置',null,'30020',null,'1','1','default','jbo.loan.BANK_COLLECT_TYPE_CONFIG','O','id=:id','','','com.amarsoft.app.awe.config.customer.CustomerAccountConfigHandler',null,'SYS_Designer','2020/10/22 11:42:42','SYS_Designer','2020/12/10 14:36:40','','0','');
-- 税率编码维护添加主体字段
Alter table tax_code_info add column lease_form varchar(5) NULL COMMENT '赁类型01直租，02回租' after remark;
-- 税率编码维护list页面添加租赁类型字段
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeList','0045','0045','1','O','lease_form','lease_form','String','','租赁类型','','1','FlatSelect','1','1','Code','leas_form','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/12/11 09:49:25','SYS_Designer','2020/12/11 10:50:03','0','','1','','','','');
-- 税率编码维护info页面添加校验和字段
delete from AWE_DO_CATALOG where dono='taxCodeInfo';
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('taxCodeInfo','税率编码信息',null,'30',null,'1','1','default','jbo.app.tenwa.calc.TAX_CODE_INFO','O','id=:id','','','com.amarsoft.app.awe.config.classmethod.TaxCodeInfoHandler',null,'SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','0','');
delete from awe_do_library where dono='taxCodeInfo';
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0010','0010','1','O','id','id','String','','id','','1','Text','1','1','','','',null,'0','0','0','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0020','0020','1','O','code','code','String','','编码','','1','Text','1','1','','','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0030','0030','1','O','full_code','full_code','String','','合并编码','','1','Text','1','1','','','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0040','0040','1','O','tax_type','tax_type','String','','名称','','1','Select','1','1','Code','tax_type','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0045','0045','1','O','lease_form','lease_form','String','','租赁类型','','1','Select','1','1','Code','leas_form','','20','1','0','1','1','0',0,'','','','SYS_Designer','2020/12/11 09:51:16','SYS_Designer','2020/12/11 10:51:43','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0050','0050','1','O','remark','remark','String','','简称','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','','1','','','','');