diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp index c673e6fde..e574a7e98 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp @@ -17,9 +17,9 @@ Map flowParam = GetFlowAction.getFlowParamByFlowUnid(sFlowUnid); String borrowId = flowParam.get("BorrowId"); ASObjectModel doTemp = new ASObjectModel(sTempletNo); - BizObject lfbit = JBOFactory.getBizObjectManager(LB_FILE_BORROWING_INFO_TEMP.CLASS_NAME).createQuery("FLOWUNID=:flowunid ").setParameter("flowunid",sFlowUnid).getSingleResult(false); - String fileIds = lfbit.getAttribute("DOCIDS").getString(); - doTemp.setJboWhere("ID IN "+fileIds); + BizObject lfbit = JBOFactory.getBizObjectManager(LB_FILE_BORROWING_INFO_TEMP.CLASS_NAME).createQuery("FLOWUNID=:flowunid ").setParameter("flowunid",sFlowUnid).getSingleResult(false); + String fileIds = lfbit.getAttribute("DOCIDS").getString(); + doTemp.setJboWhere("ID IN "+fileIds); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; dwTemp.ReadOnly = "1"; diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/LCFundIncomeTempDeductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/LCFundIncomeTempDeductionList.jsp index 09e04b9cf..5892d2ee3 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/LCFundIncomeTempDeductionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/LCFundIncomeTempDeductionList.jsp @@ -16,10 +16,10 @@ doTemp.setHtmlEvent("MEMO", "onmouseover", "showMemo"); doTemp.setHtmlEvent("MEMO", "onmouseout", "hideMemo"); doTemp.setHtmlEvent("MEMO", "onkeyup", "synchMemo"); - if("0020".equals(phaseNo)){ + /* if("0020".equals(phaseNo)){ doTemp.setRequired("ACCOUNTING_DATE", true); doTemp.setReadOnly("FACT_DATE", true); - } + } */ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; if(!"ReadOnly".equals(rightType)){ diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/RentIncome.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/RentIncome.jsp index 3a222b7ff..0d237ec85 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/RentIncome.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/RentIncome.jsp @@ -3,6 +3,7 @@ <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/IncludeBegin.jsp"%> <% + //dwTemp.MultiSelect = true; //多选 String flowunid = CurPage.getAttribute("FlowUnid"); //参数：0.是否显示, 1.标题, 2.JS事件字符串表示(TabContentFrame会替换为真实名称), 3. 是否缓存(默认是), 4. 是否有关闭按钮(默认无), 5. Strip高度(默认600px) String sTabStrip[][] = { diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index b9509e8ad..8e5a6da09 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -55,7 +55,6 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { } // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); - CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); String VOUCHER_TYPE = "1";// 凭证分类 金蝶 String userid = "admin"; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java index 2160df90b..248013c74 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java @@ -92,6 +92,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { String disRatio=dataList1.get(0).get("DIS_RATIO"); if("01".equals(leas_form)){ taxRate=new BigDecimal("1.16"); + }else { taxRate=new BigDecimal("1.06"); } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java index 6ee2c39e6..5105bcaeb 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java @@ -4,7 +4,10 @@ import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; import com.base.util.QuartzUtil; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMonthSettlement; @@ -12,16 +15,25 @@ public class CreateVoucherMonthSettlementMission implements Job { @Override public void execute(JobExecutionContext arg0) throws JobExecutionException { + // 获取当前系统时间 String startime = StringFunction.getTodayNow(); + Transaction Sqlca =null; + // 获取用户id Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId"); String curUserId = userId == null? "system" : userId.toString(); try{ + // 创建事物, 修改contract_rent_month中end_date为当前时间(月结凭证生成时间) + Sqlca = Transaction.createTransaction("als"); + String sql = "UPDATE contract_rent_month SET END_DATE=DATE_FORMAT('"+startime+"','%Y/%m/%d') WHERE LEFT('"+startime+"',7)=DATE_FORMAT(END_DATE,'%Y/%m') "; + Sqlca.executeSQL(sql); + Sqlca.commit(); + CreateVoucherMonthSettlement vouchermanage=new CreateVoucherMonthSettlement(); vouchermanage.CreateVoucher("PZ2018071200000017");//月结手续费(按月分摊)--回租 vouchermanage.CreateVoucher("PZ2018080400000104");//月结手续费(按月分摊)--直租 - + vouchermanage.CreateVoucher("PZ2018072100000048");//月结-确认贴息收入--回租 vouchermanage.CreateVoucher("PZ2018080400000103");//月结-确认贴息收入--直租 @@ -32,7 +44,22 @@ public class CreateVoucherMonthSettlementMission implements Job { vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租 QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherMonthSettlementMission", "success", "成功", curUserId); } catch (Exception e) { + try { + Sqlca.rollback(); + } catch (JBOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherMonthSettlementMission", "error", "失败", curUserId); + }finally { + if(Sqlca != null) { + try { + Sqlca.disConnect(); + } catch (JBOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } } }