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 linxiaoping

Browse Source
This commit is contained in:
linxiaoping 2018-06-23 20:07:44 +08:00
commit ba0398effa
14 changed files with 135 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp
View File

@ -62,7 +62,7 @@
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newRecord(){
var sUrl = "/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp";
AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
reloadSelf();
},"新增本方信息");
}
@ -76,7 +76,7 @@ function view(){
alert("请选择一条信息！");
return ;
}
AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
reloadSelf();
},"本方信息详情");
}
@ -89,7 +89,7 @@ function edit(){
alert("请选择一条信息！");
return ;
}
AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
reloadSelf();
},"修改本方信息");
}

2
WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp
View File

@ -27,7 +27,7 @@
AsControl.OpenView(pUrl, "vouid=<%=vouid%>&owned=<%=owned%>","_self","");
}
function selectLoanSubject(){
AsDialog.OpenSelector("SelectLoanSubject","owned,<%=owned%>","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.3) + "px",function(sReturn){
AsDialog.OpenSelector("SelectLoanSubject","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
if(!sReturn || sReturn == "_CANCEL_"||sReturn=="_NONE_"||sReturn=="_CLEAR_"){
return;
}

1
WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp
View File

@ -33,6 +33,7 @@
setItemValue(0,getRow(),"UPDATEUSERID","<%=inputusername%>");
setItemValue(0,getRow(),"INPUTORGID","<%=inputorgname%>");
setItemValue(0,getRow(),"UPDATEORGID","<%=inputorgname%>");
setItemValue(0,getRow(),"SERVER","<%=inputusername%>");
var date = new Date();
var updatetime = date.toJSON().substring(0,10).replace(/-/g,"/")+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();
var inputtime = date.toJSON().substring(0,10).replace(/-/g,"/")+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();

5
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
View File

@ -22,12 +22,13 @@
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
function save(){
debugger;
var name = getItemValue(0,0,"name");
var certid = getItemValue(0,0,"certid");
var tel = getItemValue(0,0,"tel");
var suname = getItemValue(0,0,"suname");
if(name.length > 0){
if(certid.length > 0){
debugger;
if(CheckLicense(certid)){
setItemValue(0,0,"certid",certid);
//setItemUnit(0,0,"certid","");
@ -57,7 +58,7 @@
}
}
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
"relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel"));
"relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel")+",suname="+getItemValue(0,0,"suname"));
if(sResult == "SUCCESS"){
reloadSelf();
}

2
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
View File

@ -159,7 +159,6 @@
}
function saveRecord(leasfrom,projectSource){
//as_save("myiframe0","frame_list.window.as_save(0);");
<%-- var idexpiry=getItemValue(0,getRow(),"IDEXPIRY");
var date1 = "<%=dateString%>";
if(date1>=idexpiry){
@ -179,6 +178,7 @@
var certid=getItemValue(0,0,"CERTID");
var customerid=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","updateCustomerId",'certid='+certid+',flowunid=<%=flowunid%>');
setItemValue(0,0,"customerid",customerid);
//as_save("myiframe0","frame_list.window.save(0);");
as_save("0","saveCertInfo("+leasfrom+",'"+projectSource+"')");
};
}

5
WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
View File

@ -265,6 +265,7 @@
<%/*~[Describe=Ñ¡Ôñ²úÆ·;]~*/%>
function selectBusinessType()
{
debugger;
var carAttr = false;
var lease = false;
var carAttributes = getItemValue(0,getRow(),"carAttributes");
@ -280,9 +281,11 @@
lease = true;
}
var modelid="";
var CurOrgID=<%=CurOrg.getOrgID()%>;
var YesNo="Y";
if(MyOjbect.modelid&&carAttr==true&&lease==true){
modelid=MyOjbect.modelid;
AsDialog.OpenSelector("selectProductVersionInfo","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
AsDialog.OpenSelector("selectProductVersionInfo","carAttributes,"+carAttributes+",leasehold,"+leasehold+",modelid,"+MyOjbect.modelid+",CurOrgID,"+CurOrgID+",YesNo,"+YesNo,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
{

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

@ -3480,6 +3480,7 @@
<attribute name="PAY_ID" label="PAY_ID" type="STRING" length="32"/>
<attribute name="CONTRACT_ID" label="合同号" type="STRING" length="32"/>
<attribute name="PAYMENT_NUMBER" label="投放编号" type="STRING" length="32"/>
<attribute name="PLAN_ID" label="计划ID" type="STRING" length="100"/>
<attribute name="PLAN_LIST" label="计划期次" type="STRING" length="32"/>
<attribute name="FLOWUNID" label="流程号" type="STRING" length="32"/>
<attribute name="PAY_TYPE" label="收付方向" type="STRING" length="32"/>
@ -3557,6 +3558,7 @@
<attribute name="PAY_ID" label="PAY_ID" type="STRING" length="32"/>
<attribute name="CONTRACT_ID" label="合同号" type="STRING" length="32"/>
<attribute name="PAYMENT_NUMBER" label="投放编号" type="STRING" length="32"/>
<attribute name="PLAN_ID" label="计划ID" type="STRING" length="100"/>
<attribute name="PLAN_LIST" label="计划期次" type="STRING" length="32"/>
<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
<attribute name="PAY_TYPE" label="收付方向" type="STRING" length="32"/>

15
src_cmb/com/tenwa/sdk/controller/PayController.java
View File

@ -339,7 +339,7 @@ public class PayController extends BaseFlowStartAction {
for (String income_id : income_ids) {
String date = df.format(new Date());
pay_detail = new SDKDcPayReqxVO();
infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false);
infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PLAN_ID,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false);
if(infoOne==null) {
map.put("code", "1") ;
map.put("msg", "第["+index+"]笔数据不存在,请检查") ;
@ -353,6 +353,7 @@ public class PayController extends BaseFlowStartAction {
String PLAN_LIST = infoOne.getAttribute("PLAN_LIST").toString();
String FLOWUNID = this.FLOWUNID ;
String FEE_TYPE = infoOne.getAttribute("FEE_TYPE").toString();
String PLAN_ID = infoOne.getAttribute("PLAN_ID").toString();
String PAY_TYPE = infoOne.getAttribute("PAY_TYPE").toString();
String CONTRACT_NO = infoOne.getAttribute("CONTRACT_NO").toString();
String CRTACC = infoOne.getAttribute("acc_number").toString();
@ -369,7 +370,7 @@ public class PayController extends BaseFlowStartAction {
* 检查 当前付款信息 是否存在 开始
*/
if(BANK_PAY_ID!=null && BANK_PAY_ID!="" && !"".equals(BANK_PAY_ID)) {
String temp_sql = "select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE =:FEE_TYPE " ;
String temp_sql = "select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE =:FEE_TYPE and PLAN_ID=:PLAN_ID " ;
if(BANK_YURREF!=null && BANK_YURREF!="" && !"".equals(BANK_YURREF))
temp_sql = temp_sql + " and YURREF=:BANK_YURREF";
if(BANK_SQRNBR!=null && BANK_SQRNBR!="" && !"".equals(BANK_SQRNBR))
@ -386,6 +387,7 @@ public class PayController extends BaseFlowStartAction {
call_back_detail_boo.setParameter("FLOWUNID",FLOWUNID) ;
call_back_detail_boo.setParameter("PAY_TYPE",PAY_TYPE) ;
call_back_detail_boo.setParameter("FEE_TYPE",FEE_TYPE) ;
call_back_detail_boo.setParameter("PLAN_ID",PLAN_ID) ;
if(BANK_YURREF!=null && BANK_YURREF!="" && !"".equals(BANK_YURREF))
call_back_detail_boo.setParameter("BANK_YURREF",BANK_YURREF) ;
@ -421,6 +423,7 @@ public class PayController extends BaseFlowStartAction {
|| BANK_NAME==null || "".equals( BANK_NAME )
|| PAY_TYPE==null || "".equals( PAY_TYPE )
|| FEE_TYPE==null || "".equals( FEE_TYPE )
|| PLAN_ID==null || "".equals( PLAN_ID )
|| CRTNAM==null || "".equals( CRTNAM )
|| CRTPVC==null || "".equals( CRTPVC )
|| CRTCTY==null || "".equals( CRTCTY )
@ -472,6 +475,7 @@ public class PayController extends BaseFlowStartAction {
pay_detail_bo.setAttributeValue("CONTRACT_ID", CONTRACT_ID);
pay_detail_bo.setAttributeValue("PAYMENT_NUMBER", PAYMENT_NUMBER);
pay_detail_bo.setAttributeValue("PLAN_LIST", PLAN_LIST);
pay_detail_bo.setAttributeValue("PLAN_ID", PLAN_ID);
pay_detail_bo.setAttributeValue("FLOWUNID", FLOWUNID);
pay_detail_bo.setAttributeValue("PAY_TYPE", PAY_TYPE);
pay_detail_bo.setAttributeValue("FEE_TYPE", FEE_TYPE);
@ -546,13 +550,14 @@ public class PayController extends BaseFlowStartAction {
if(pay_detail_list!=null && pay_detail_list.size()>0)
for (BizObject pay_detail_one : pay_detail_list) {
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE ");
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE and PLAN_ID=:PLAN_ID ");
income_boo.setParameter("CONTRACT_ID",pay_detail_one.getAttribute("CONTRACT_ID").toString()) ;
income_boo.setParameter("PAYMENT_NUMBER",pay_detail_one.getAttribute("PAYMENT_NUMBER").toString()) ;
income_boo.setParameter("PLAN_LIST",pay_detail_one.getAttribute("PLAN_LIST").toString()) ;
income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ;
income_boo.setParameter("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()) ;
income_boo.setParameter("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()) ;
income_boo.setParameter("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()) ;
income_bo = income_boo.getSingleResult(true) ;
income_bo.setAttributeValue("BANK_PAY_ID",pay_detail_one.getAttribute("PAY_ID").toString());
income_bo.setAttributeValue("BANK_YURREF",pay_detail_one.getAttribute("YURREF").toString());
@ -640,7 +645,7 @@ public class PayController extends BaseFlowStartAction {
BizObjectManager income_bom = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME);
BizObject income_bo = null ;
tx.join(income_bom);
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE ");
BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE and PLAN_ID=:PLAN_ID ");
for (BizObject pay_detail_one : pay_detail_list) {
if(DETAIL_YURREF.equals( pay_detail_one.getAttribute("YURREF").toString() )) {
@ -650,6 +655,7 @@ public class PayController extends BaseFlowStartAction {
income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ;
income_boo.setParameter("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()) ;
income_boo.setParameter("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()) ;
income_boo.setParameter("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()) ;
income_bo = income_boo.getSingleResult(true) ;
income_bo.setAttributeValue("BANK_SQRNBR",detail.getSQRNBR());
income_bo.setAttributeValue("BANK_REQNBR",detail.getREQNBR());
@ -662,6 +668,7 @@ public class PayController extends BaseFlowStartAction {
callback_detail_bo.setAttributeValue("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString());
callback_detail_bo.setAttributeValue("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString());
callback_detail_bo.setAttributeValue("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString());
callback_detail_bo.setAttributeValue("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString());
}
}
}

20
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ReceiveDealerMarginForLoan.java Normal file
View File

@ -0,0 +1,20 @@
package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan;
import java.util.HashMap;
import java.util.Map;
import com.amarsoft.are.jbo.JBOTransaction;
import com.tenwa.comm.exception.BusinessException;
import com.tenwa.voucher.service.VoucherJavaParamService;
public class ReceiveDealerMarginForLoan implements VoucherJavaParamService {
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
return returnValue;
}
}

68
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherReceiveDealerMargin.java Normal file
View File

@ -0,0 +1,68 @@
package com.tenwa.voucher.CreateVoucherProcess;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.voucher.LV_VOUCHER_CONFIG;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.flow.baseBussion.BaseBussiness;
import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
public class CreateVoucherReceiveDealerMargin extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
Map<String,String> map=new HashMap<String, String>();
Map<String,String> param=new HashMap<String, String>();
String MONEY=null;
String ACCOUNTING_DATE=null;
String FACT_DATE=null;
String LEAS_FORM=null;
String DISTRIBUTOR_NO=null;
String DISTRIBUTOR_NAME=null;
String FlowUnid=this.getAttribute("FlowUnid").toString();
map.put("FlowUnid", FlowUnid);
String sql="SELECT DDIT.CAUTION_MONEY AS MONEY,DDIT.COLLECT_TIME AS ACCOUNTING_DATE,"
+ "DDIT.COLLECT_TIME AS FACT_DATE ,'02' AS LEAS_FORM ,DIF.DISTRIBUTOR_NO,"
+ "DIF.DISTRIBUTOR_NAME FROM D_DEPOSITCHARGE_INFO_TEMP DDIT LEFT JOIN "
+ "DISTRIBUTOR_INFO DIF ON DDIT.DISTRIBUTOR_ID=DIF.ID WHERE DDIT.FLOWUNID=:FLOWUNID";
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
String VOUCHER_TYPE="1";// 凭证分类 金蝶
String userid ="admin";
for(Map<String,String> ma:dataList){
MONEY=ma.get("MONEY");
ACCOUNTING_DATE=ma.get("ACCOUNTING_DATE");
FACT_DATE=ma.get("FACT_DATE");
LEAS_FORM=ma.get("LEAS_FORM");
DISTRIBUTOR_NO=ma.get("DISTRIBUTOR_NO");
DISTRIBUTOR_NAME=ma.get("DISTRIBUTOR_NAME");
param.put("MONEY", MONEY);
param.put("ACCOUNTING_DATE", ACCOUNTING_DATE);
param.put("FACT_DATE", FACT_DATE);
param.put("LEAS_FORM", LEAS_FORM);
param.put("DISTRIBUTOR_NO", DISTRIBUTOR_NO);
param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME);
map.clear();
map.put("PROJ_TYPE", LEAS_FORM);
map.put("MODULAR_NUMBER", "记录经销商保证金");
BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
if(vouch!=null){
vs.createVoucher("记录经销商保证金", vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca);
}
}
return "true";
}
}

14
src_core/com/tenwa/voucher/CreateVoucherProcess/createVoucherLoanDistributor.java
View File

@ -1,14 +0,0 @@
package com.tenwa.voucher.CreateVoucherProcess;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.flow.baseBussion.BaseBussiness;
public class createVoucherLoanDistributor extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
return super.run(Sqlca);
}
}

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

@ -45,12 +45,18 @@ public class VoucherToV8Impl implements VoucherService {
*/
private static final String moduleName_value = "网银导入";
/**
* 欧力士特殊生成凭证模块
* 因根据合同号都会把凭证归属在合同对应所属公司下，这样不满足欧力士现业务需求
*/
private static final String SPECIAL_MODULENAME = "代收深圳款";
/**
* 经销商保证金收取使用的参考变量
*
*/
private static final String Receive_Dealer_Margin="记录经销商保证金";
public String saveMessage(List<Map<String,String>> list,Map<String,String> param,BizObject user,JBOTransaction tx) throws Exception{
try{
@ -79,13 +85,13 @@ public class VoucherToV8Impl implements VoucherService {
String contracid=list.get(i).get("CONTRACT_ID");//合同号
String modularNumber=param.get("MODULAR_NUMBER");//凭证编号
//网银导入、代收租金 的凭证不需要合同号
if(!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) && Tools.isNullOrEmpty(contracid)){
if(!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) && Tools.isNullOrEmpty(contracid)){
log.error("合同号为空,无法构建对应的凭证信息!");
return null;
}
//检查合同ID是否是正确的
if(!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){
if(!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){
BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false);
if(contract==null){

11
src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
View File

@ -30,7 +30,16 @@ public class CustomerInfoManage {
private String leas_from;
private String idexpiry;
private String project_source;
private String suname;
public String getSuname() {
return suname;
}
public void setSuname(String suname) {
this.suname = suname;
}
public String getProject_source() {
return project_source;
}
@ -169,6 +178,7 @@ public class CustomerInfoManage {
bo.setAttributeValue("certid", certid);
bo.setAttributeValue("name", name);
bo.setAttributeValue("tel", tel);
bo.setAttributeValue("suname", suname);
}else{
bo = bom.newObject();
bo.setAttributeValue("flowunid", flowunid);
@ -179,6 +189,7 @@ public class CustomerInfoManage {
bo.setAttributeValue("certtype", "Ind01");
bo.setAttributeValue("name", name);
bo.setAttributeValue("tel", tel);
bo.setAttributeValue("suname", suname);
}
bom.saveObject(bo);
}catch(Exception e){

4
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java
View File

@ -196,7 +196,7 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness {
DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondition, CUSTOMER_CERT_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondition, CUSTOMER_FAMILY_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondition, CUSTOMER_ADDRESS_HIS.CLASS_NAME, null, other, null, Sqlca);
other.put("proj_id", union.getAttribute("PROJECT_ID").getString());
//other.put("proj_id", union.getAttribute("PROJECT_ID").getString());
DataOperatorUtil.copyJBOSet(CUSTOMER_INFO.CLASS_NAME, fromCondition, CUSTOMER_INFO_HIS.CLASS_NAME, null, other, null, Sqlca);
}
@ -218,7 +218,7 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness {
DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondition, CUSTOMER_CERT_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondition, CUSTOMER_FAMILY_HIS.CLASS_NAME, null, other, null, Sqlca);
DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondition, CUSTOMER_ADDRESS_HIS.CLASS_NAME, null, other, null, Sqlca);
other.put("proj_id", unit.getAttribute("PROJECT_ID").getString());
//other.put("proj_id", unit.getAttribute("PROJECT_ID").getString());
DataOperatorUtil.copyJBOSet(CUSTOMER_INFO.CLASS_NAME, fromCondition, CUSTOMER_INFO_HIS.CLASS_NAME, null, other, null, Sqlca);
}