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

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into guojiayi1

Browse Source
This commit is contained in:
G 2018-10-16 14:19:40 +08:00
commit 41778c321e
14 changed files with 423 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp Normal file
View File

@ -0,0 +1,31 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
/*
Author: undefined 2018-10-15
Content: 示例详情页面
History Log:
*/
String contract_number = CurPage.getParameter("FlowKey");
String sPrevUrl = CurPage.getParameter("PrevUrl");
if(sPrevUrl == null) sPrevUrl = "";
String sTempletNo = "LBRegisterContractInfoD";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
//doTemp.setColTips("", "测试");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
dwTemp.ReadOnly = "-2";//只读模式
dwTemp.genHTMLObjectWindow(contract_number);
String sButtons[][] = {
//{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
};
sButtonPosition = "south";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function returnList(){
AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

6
WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp
View File

@ -1,6 +1,7 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
String userid = CurPage.getUserId();
String sTempletNo = "LBRegisterContractInfo";//--Ä£°åºÅ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
@ -20,7 +21,8 @@
as_save("myiframe0");
}
function selectContract(){
AsDialog.OpenSelector("SelectContractForRegister","","dialogWidth=" + parseInt(window.screen.width * 0.3) + "px dialogHeight=" + parseInt(window.screen.height * 0.4) + "px",function(sReturn){
var userid = "<%=userid%>";
AsDialog.OpenSelector("SelectContractForRegister","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.8) + "px",function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"){
return;
}

45
WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp Normal file
View File

@ -0,0 +1,45 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
/*
Author: undefined 2018-10-15
Content:
History Log:
*/
ASObjectModel doTemp = new ASObjectModel("DayDistribute");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "0"; //只读模式
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
/* $(function(){
$("#DIV_Data_myiframe0_2_2").hide();
}) */
function newRecord(){
var sUrl = "";
AsControl.OpenView(sUrl,'','_self','');
}
function viewAndEdit(){
var sUrl = "";
var sPara = getItemValue(0,getRow(0),'SerialNo');
if(typeof(sPara)=="undefined" || sPara.length==0 ){
alert("参数不能为空！");
return ;
}
AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

2
WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp
View File

@ -12,7 +12,7 @@
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
//dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ
dwTemp.ReadOnly = "0";//Ö»¶Áģʽ
dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
String sButtons[][] = {

22
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -4669,6 +4669,28 @@
</managerProperties>
</manager>
</class>
<class name="DAY_DISTRIBUTE" label="" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="32"/>
<attribute name="role" label="催款员角色" type="STRING" length="32"/>
<attribute name="begin_day" label="开始天数" type="INT" length="10"/>
<attribute name="end_day" label="结束天数" type="INT" length="10"/>
<attribute name="FIELD1" label="FIELD1" type="STRING" length="32"/>
<attribute name="FIELD2" label="FIELD2" type="STRING" length="32"/>
<attribute name="INPUTUSERID" label="INPUTUSERID" type="STRING" length="32"/>
<attribute name="INPUTORGID" label="INPUTORGID" type="STRING" length="32"/>
<attribute name="INPUTTIME" label="INPUTTIME" type="STRING" length="32"/>
<attribute name="UPDATEUSERID" label="UPDATEUSERID" type="STRING" length="32"/>
<attribute name="UPDATEORGID" label="UPDATEORGID" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="UPDATETIME" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="day_distribute" />
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
</package>
<package name="jbo.com.tenwa.lease.carbrand" >
<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">

20
calc/com/tenwa/reckon/bean/ConditionBean.java
View File

@ -181,6 +181,26 @@ public class ConditionBean implements Cloneable{
// private String pmtEndValue; //租金测算pmt公式后期测算代入的值,相当于期末残值,默认为0
// private String endIrr;// 合同结束时的实际IRR
/**
* 调整罚息的取值方式
* */
private String RATE_TYPE;
private String ADJUST_TYPE;
public String getRATE_TYPE() {
return RATE_TYPE;
}
public void setRATE_TYPE(String rATE_TYPE) {
RATE_TYPE = rATE_TYPE;
}
public String getADJUST_TYPE() {
return ADJUST_TYPE;
}
public void setADJUST_TYPE(String aDJUST_TYPE) {
ADJUST_TYPE = aDJUST_TYPE;
}
/**
*
* <p>ConditionBean ID。</p>

2
calc/com/tenwa/reckon/product/ProductCondition.java
View File

@ -872,7 +872,7 @@ public class ProductCondition {
if(s.length()>0)s+=",";
s+="'even_subsection'";
}
// ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "colreadonly", "1");
ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "colreadonly", "1");
ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "coleditsource", "jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='settle_method' and itemno in ("+s+") order by sortno");
ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "coldefaultvalue", s.replaceAll("'", ""));

16
calc/com/tenwa/reckon/util/TransRateHelper.java
View File

@ -206,7 +206,8 @@ public class TransRateHelper {
* @return
* @throws JBOException
*/
public static String getNewRate(ConditionBean condition, String oldYearRate,BizObject adjust) throws JBOException {
/* 原版的 调息方法
* public static String getNewRate(ConditionBean condition, String oldYearRate,BizObject adjust) throws JBOException {
String newRate = "0";
if("calculation".equals(condition.getAdjustType())){
if ("proportion".equals(condition.getRateFloatType())) {// 按央行利率浮动时
@ -224,6 +225,19 @@ public class TransRateHelper {
newRate = oldYearRate;
}
return newRate;
}*/
public static String getNewRate(ConditionBean condition, String oldYearRate,BizObject adjust) throws JBOException {
String newRate = "0";
if("ratetype01".equals(condition.getRATE_TYPE())){
if ("calculation".equals(condition.getADJUST_TYPE())) {// 按央行利率浮动时
newRate = getRateByProportion(condition.getLeaseTerm(), oldYearRate, adjust, condition.getRateFloatAmt());
} else{// 按央利率加点时
newRate = getRateByPoint(condition.getLeaseTerm(), adjust, condition.getRateFloatAmt());
}
}else{
newRate = oldYearRate;
}
return newRate;
}
/**

4
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
View File

@ -54,7 +54,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
String ACC_NUMBER=null; // 银行账号
String sql="";
sql="SELECT LFIT1.EQUIP,ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS EQUIPNOTAX,(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS EQUIPTAX,LFIT2.OTHER_MONEY,ROUND(LFIT2.OTHER_MONEY / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS OTHERNOTAX,(LFIT2.OTHER_MONEY - ROUND(LFIT2.OTHER_MONEY / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS OTHERTAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY) AS EQUIP_OTHER,LFIT3.FIRST_PAYMENT,LFIT4.GUARANTY,LFIT5.HANDLING_CHARGE_MONEY,ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2) AS HANDLING_CHARGE_MONEY_NOTAX,(LFIT5.HANDLING_CHARGE_MONEY - ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2)) AS HANDLING_CHARGE_MONEY_TAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY) AS OTHERS_MATH, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.`ID` LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP,MAX(ACCOUNTING_DATE) AS ACCOUNT_DATE FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID) LFIT1 ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY,ACCOUNTING_DATE AS ACCOUNT_DATE FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD,ACCOUNTING_DATE AS ACCOUNT_DATE FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS GUARANTY,SETTLE_METHOD,ACCOUNTING_DATE AS ACCOUNT_DATE FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2') LFIT4 ON LFIT4.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD,ACCOUNTING_DATE AS ACCOUNT_DATE FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1') LFIT5 ON LFIT5.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LFIT1.FLOWUNID = :FLOWUNID ";
sql="SELECT LFIT1.EQUIP,ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS EQUIPNOTAX,(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS EQUIPTAX,LFIT2.OTHER_MONEY,ROUND(LFIT2.OTHER_MONEY / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS OTHERNOTAX,(LFIT2.OTHER_MONEY - ROUND(LFIT2.OTHER_MONEY / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS OTHERTAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY) AS EQUIP_OTHER,LFIT3.FIRST_PAYMENT,LFIT4.GUARANTY,LFIT5.HANDLING_CHARGE_MONEY,ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2) AS HANDLING_CHARGE_MONEY_NOTAX,(LFIT5.HANDLING_CHARGE_MONEY - ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2)) AS HANDLING_CHARGE_MONEY_TAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY) AS OTHERS_MATH,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.`ID` LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype10'GROUP BY CONTRACT_ID,FLOWUNID) LFIT1 ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2') LFIT4 ON LFIT4.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1') LFIT5 ON LFIT5.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID ";
// 非差额放款部分
if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092600000225".equals(VOUCHERNO)){
@ -141,7 +141,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
// 判断传统类型
if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2018092600000223".equals(VOUCHERNO)){
// 融资租赁资产
param.put("LEASFORMASSET", "06");
param.put("LEASFORMASSET", "02/03/05/06");
// 业务一部
param.put("DEPT", "01");
// 传统融资租赁收入

1
src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
View File

@ -361,6 +361,7 @@ public class CreateVoucherServiceImpl {
String LEAS_FORM = param.get("LEAS_FORM");
// »ñÈ¡µ±Ç°Æ¾Ö¤½è´ûÐòºÅ
String SORT_NUMBER = bo.getAttribute("SORT_NUMBER").getString();
subData.put("SORT_NUMBER", SORT_NUMBER);
// Ö±×â¼Ç¼ӽð
if("PZ2018082000000141".equals(VOUCHERNO)) {
if("01".equals(LEAS_FORM)) {

244
src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java Normal file
View File

@ -0,0 +1,244 @@
package com.tenwa.voucher.serviceImp;
import java.io.File;
import java.io.FileOutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
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.are.jbo.JBOTransaction;
import com.amarsoft.are.log.Log;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.util.SerialNumberUtil;
import jbo.com.tenwa.entity.comm.own.OWN_INFO;
public class ExprotVoucherToXML {
private static Log logger = ARE.getLog();
// 方法页面传入参数
public String ids;
public String getIds() {
return ids;
}
public void setIds(String ids) {
this.ids = ids;
}
/**
* 调用生成xml的方法
*/
public String ExprotVoucher(JBOTransaction tx){
// 创建事物
Transaction Sqlca = null;
// 定义全局F3
String f3="";
try {
Sqlca = Transaction.createTransaction(tx);
System.out.println(ids);
String year_month_day = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
/**
* 定义全局变量
*/
String batch = SerialNumberUtil.getVoucherPCNumber(Sqlca);// 获取批次号
Map<String, String> map = new HashMap<String, String>(); // 参数map
// 创建Document对象
Document document = DocumentHelper.createDocument();
// 设置xml头
Element root = document.addElement("ufinterface"); // 设置xml头
root.addAttribute("billtype", "gl"); // 设置xml头属性
root.addAttribute("codeexchanged", "y");
root.addAttribute("docid", "989898989898");
root.addAttribute("proc", "add");
root.addAttribute("receiver", "2000");
root.addAttribute("roottag", "voucher");
root.addAttribute("sender", "1278");
String[] idArr = ids.split("_");
for (String F3 : idArr) {
f3=F3;
// 设置参数
map.clear();
map.put("F3",F3);
// 获取v8表数据
String sql1 = "SELECT ID,F5,F6,F49,F51,F52,F59,F63,F64,F73,F74,F75,F76 FROM VOUCHER_V8 WHERE F3=:F3 ORDER BY F59 ";
List<Map<String, String>> v1 = DataOperatorUtil.getDataBySql(Sqlca,sql1,map);
String ownId = v1.get(0).get("F49");
// 获取本方信息
BizObject own = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME, "id=:ownId").setParameter("ownId", ownId).getSingleResult(false);
// 单条凭证头
Element voucher = root.addElement("voucher");
voucher.addAttribute("id", batch);
Element voucherHead = voucher.addElement("voucher_head");
Element company = voucherHead.addElement("company");// 本方公司名称
company.setText(own.getAttribute("OWN_NAME").getString());
Element voucher_type = voucherHead.addElement("voucher_type");
voucher_type.setText("收款凭证");
Element fiscal_year = voucherHead.addElement("fiscal_year");
fiscal_year.setText(v1.get(0).get("F51"));
Element accounting_period = voucherHead.addElement("accounting_period");
accounting_period.setText(v1.get(0).get("F52"));
Element voucher_id = voucherHead.addElement("voucher_id");
voucher_id.setText("");
Element attachment_number = voucherHead.addElement("attachment_number");
attachment_number.setText("");
Element date = voucherHead.addElement("date");
date.setText("");
Element enter = voucherHead.addElement("enter");
enter.setText("");
Element cashier = voucherHead.addElement("cashier");
cashier.setText("");
Element signature = voucherHead.addElement("signature");
signature.setText("");
Element checker = voucherHead.addElement("checker");
checker.setText("");
Element posting_date = voucherHead.addElement("posting_date");
posting_date.setText("");
Element posting_person = voucherHead.addElement("posting_person");
posting_person.setText("");
Element voucher_making_system = voucherHead.addElement("voucher_making_system");
voucher_making_system.setText("");
Element memo1 = voucherHead.addElement("memo1");
memo1.setText("");
Element memo2 = voucherHead.addElement("memo2");
memo2.setText("");
Element reserve1 = voucherHead.addElement("reserve1");
reserve1.setText("");
Element reserve2 = voucherHead.addElement("reserve2");
reserve2.setText("");
Element revokeflag = voucherHead.addElement("revokeflag");
revokeflag.setText("");
Element voucher_body = voucher.addElement("voucher_body");
// 借贷配置信息
for (Map<String, String> v8 : v1) {
Element entry = voucher_body.addElement("entry");
Element entry_id = entry.addElement("entry_id");
entry_id.setText(v8.get("F59"));
Element account_code = entry.addElement("account_code");
account_code.setText("");
Element abstract1 = entry.addElement("abstract");
abstract1.setText(v8.get("F5"));
Element settlement = entry.addElement("settlement");
settlement.setText("");
Element document_id = entry.addElement("document_id");
document_id.setText("");
Element document_date = entry.addElement("document_date");
document_date.setText("");
Element currency = entry.addElement("currency");
currency.setText("人民币");
Element unit_price = entry.addElement("unit_price");
unit_price.setText("");
Element exchange_rate1 = entry.addElement("exchange_rate1");
exchange_rate1.setText("");
Element exchange_rate2 = entry.addElement("exchange_rate2");
exchange_rate2.setText("");
Element debit_quantity = entry.addElement("debit_quantity");
debit_quantity.setText("");
Element primary_debit_amount = entry.addElement("primary_debit_amount");
primary_debit_amount.setText("");
Element secondary_debit_amount = entry.addElement("secondary_debit_amount");
secondary_debit_amount.setText("");
Element natural_debit_currency = entry.addElement("natural_debit_currency");
natural_debit_currency.setText("");
Element credit_quantity = entry.addElement("credit_quantity");
credit_quantity.setText("");
Element primary_credit_amount = entry.addElement("primary_credit_amount");
primary_credit_amount.setText("");
Element secondary_credit_amount = entry.addElement("secondary_credit_amount");
secondary_credit_amount.setText("");
Element natural_credit_currency = entry.addElement("natural_credit_currency");
natural_credit_currency.setText("");
Element bill_type = entry.addElement("bill_type");
bill_type.setText("");
Element bill_id = entry.addElement("bill_id");
bill_id.setText("");
Element bill_date = entry.addElement("bill_date");
bill_date.setText("");
Element auxiliary_accounting = entry.addElement("auxiliary_accounting");
/**
* 获取辅助账信息
*/
String AUXILIARYSQL = "SELECT LAA.AUX_NAME FROM LV_STACTS_CONFIG LSC LEFT JOIN LV_AUXILIARY_ACCOUNT LAA ON LSC.AUXILIARY_TYPE LIKE CONCAT('%',LAA.ID,'%') WHERE LSC.ID=:ID ";
map.clear(); map.put("ID", v8.get("F6"));
List<Map<String, String>> A1 = DataOperatorUtil.getDataBySql(Sqlca,AUXILIARYSQL,map);
for (Map<String, String> fuzhu : A1) {
// 后期调整, 辅助账名称变更好需要更改此处代码***
if("融资租赁资产辅助核算".equals(fuzhu.get("AUX_NAME"))) {
Element item = auxiliary_accounting.addElement("item");
item.addAttribute("name", fuzhu.get("AUX_NAME"));
item.setText(v8.get("F64"));
}
if("部门辅助核算".equals(fuzhu.get("AUX_NAME"))) {
Element item = auxiliary_accounting.addElement("item");
item.addAttribute("name", fuzhu.get("AUX_NAME"));
item.setText(v8.get("F63"));
}
if("融资租赁收入类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
Element item = auxiliary_accounting.addElement("item");
item.addAttribute("name", fuzhu.get("AUX_NAME"));
item.setText(v8.get("F73"));
}
if("资金类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
Element item = auxiliary_accounting.addElement("item");
item.addAttribute("name", fuzhu.get("AUX_NAME"));
item.setText(v8.get("F74"));
}
if("主营类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
Element item = auxiliary_accounting.addElement("item");
item.addAttribute("name", fuzhu.get("AUX_NAME"));
item.setText(v8.get("F75"));
}
if("银行账户辅助核算".equals(fuzhu.get("AUX_NAME"))) {
Element item = auxiliary_accounting.addElement("item");
item.addAttribute("name", fuzhu.get("AUX_NAME"));
item.setText(v8.get("F76"));
}
}
Element detail = entry.addElement("detail");
detail.setText("");
}
// 更改导出状态为已导出
String updSql="UPDATE VOUCHER_V8 SET V8_FLAG='1' WHERE F3='"+F3+"' ";
Sqlca.executeSQL(updSql);
Sqlca.commit();
logger.info("导出成功-凭证编号: "+F3);
}
String URL="D:\\voucherXml_NC\\APleasing_VOUCHER_"+year_month_day+".xml";
File file = new File(URL);
XMLWriter writer = new XMLWriter(new FileOutputStream(file), OutputFormat.createPrettyPrint());
writer.setEscapeText(false);// 字符是否转义,默认true
writer.write(document);
writer.close();
} catch (Exception e) {
try {
String updSql="UPDATE VOUCHER_V8 SET V8_FLAG='-1' WHERE F3='"+f3+"' ";
Sqlca.executeSQL(updSql);
Sqlca.commit();
} catch (Exception e2) {
logger.debug("导出失败-凭证编号: "+f3);
e2.printStackTrace();
}
logger.info("生成失败");
e.printStackTrace();
return "false";
}finally {
if(Sqlca!=null) {
try {
Sqlca.disConnect();
} catch (JBOException e) {
e.printStackTrace();
}
}
}
return "true";
}
}

2
src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
View File

@ -124,7 +124,7 @@ public class VoucherToV8Impl implements VoucherService {
d.put("F52", list.get(i).get("F1").substring(5,7));//会计期间-月
}
d.put("F12", user.getAttribute("username").getString());//制单人
d.put("F59", i+1+"");
d.put("F59", list.get(i).get("SORT_NUMBER"));
d.put("F62",list.get(i).get("F6"));
d.put("F60",list.get(i).get("CONTRACT_NUMBER"));

4
src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java
View File

@ -11,8 +11,8 @@ public class RegisterContractInfoHandler extends CommonHandler{
protected void initDisplayForAdd(BizObject bo) throws Exception {
bo.setAttributeValue("SENT_PERSON", this.curUser.getUserName());
bo.setAttributeValue("SENT_DATE", DateAssistant.getToday());
bo.setAttributeValue("INPUTUSERID", this.curUser.getUserID());
bo.setAttributeValue("INPUTTIME", DateAssistant.getTodayNow());
//bo.setAttributeValue("INPUTUSERID", this.curUser.getUserID());
//bo.setAttributeValue("INPUTTIME", DateAssistant.getTodayNow());
super.initDisplayForAdd(bo);
}
}

37
src_tenwa/quartz/AutoDistribute.java
View File

@ -8,6 +8,7 @@ import java.util.UUID;
import jbo.app.tenwa.calc.VI_NORMALSETTLE_CONTRACT;
import jbo.awe.USER_INFO;
import jbo.com.tenwa.lease.comm.DAY_DISTRIBUTE;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.VI_AUTODISTRIBUTE;
import jbo.com.tenwa.lease.comm.VI_NORMALEND_CONTRACT;
@ -53,9 +54,9 @@ public class AutoDistribute implements Job{
JBOTransaction tx = JBOFactory.createJBOTransaction();
ownershipTransferSign(tx,arg0);
tx.commit();
QuartzUtil.insertLog(startime, "quartz.ContractInfoForNomalSettle", "success", "成功", curUserId);
QuartzUtil.insertLog(startime, "quartz.AutoDistribute", "success", "成功", curUserId);
} catch (Exception e) {
QuartzUtil.insertLog(startime, "quartz.ContractInfoForNomalSettle", "error", "失败", curUserId);
QuartzUtil.insertLog(startime, "quartz.AutoDistribute", "error", "失败", curUserId);
e.printStackTrace();
}
}
@ -64,6 +65,36 @@ public class AutoDistribute implements Job{
public void ownershipTransferSign(JBOTransaction tx ,JobExecutionContext arg0) throws Exception{
Transaction Sqlca = null;
Sqlca = Transaction.createTransaction(tx);
//int beginDay1 = 0;
//int endDay1 = 0;
int beginDay2 = 0;
int endDay2 = 0;
//int beginDay3 = 0;
//获取天数
/*@SuppressWarnings("unchecked")
List<BizObject> dayDistribute = JBOFactory.createBizObjectQuery(DAY_DISTRIBUTE.CLASS_NAME, "select * from O").getResultList(false);
for (BizObject bizObject : dayDistribute) {
String role = bizObject.getAttribute("role").toString();
int beginDay = bizObject.getAttribute("begin_day").getInt();
int endDay = bizObject.getAttribute("end_day").getInt();
if("轻催组".equals(role)){
beginDay1 = beginDay;
endDay1 = endDay;
}else if("中催组".equals(role)){
beginDay2 = beginDay;
endDay2 = endDay;
}else{
beginDay3 = beginDay;
}
}*/
BizObject dayDistribute = JBOFactory.createBizObjectQuery(DAY_DISTRIBUTE.CLASS_NAME, "role=:role").setParameter("role", "中催组").getSingleResult(false);
if(dayDistribute !=null){
beginDay2 = dayDistribute.getAttribute("begin_day").getInt();
endDay2 = dayDistribute.getAttribute("end_day").getInt();
}else{
return;
}
//轻催组下的用户
String Sql1="SELECT ur.roleid,O.userid AS userid,O.loginid,O.username FROM USER_INFO O LEFT JOIN USER_ROLE AS ur ON ur.USERID = O.USERID LEFT JOIN USER_TASK_INFO uti ON uti.userid=O.userid AND uti.roleid=ur.roleid WHERE O.status='1' AND ur.roleid='800R00000041'";
@ -117,7 +148,7 @@ public class AutoDistribute implements Job{
//催款员
String partDept = overdue.getAttribute("part_dept").toString();
if(overDay>3 && overDay<=15){
if(overDay>=beginDay2 && overDay<=endDay2){
if(Arrays.asList(B).contains(partDept)){
//此催款员是中催组的人员，不做任何操作
}else{