From eff25c1b166ae3d24fd7d9e4dfd90b1d4b56f1e8 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 16 Oct 2018 10:03:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBRegisterContractInfoD.jsp | 31 +++++++++++ .../RegisterExpress/RegisterExpressInfo.jsp | 6 +- .../overduedunning/DayDistribute.jsp | 55 +++++++++++++++++++ .../overduedunning/OverdueDunningInfo.jsp | 2 +- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 22 ++++++++ .../RegisterContractInfoHandler.java | 4 +- 6 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp create mode 100644 WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp diff --git a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp new file mode 100644 index 000000000..444ad28db --- /dev/null +++ b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp @@ -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"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp index e85be27bd..b627fef0f 100644 --- a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp +++ b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp @@ -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; } diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp new file mode 100644 index 000000000..26ac2478a --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp @@ -0,0 +1,55 @@ +<%@ 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"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp index 49d90593f..ff7c25e04 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp @@ -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[][] = { diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 703214a04..232ba8560 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4669,6 +4669,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java b/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java index 47348034d..a015f739d 100644 --- a/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java +++ b/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java @@ -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); } } From a07adc57fed90b69557d2f1f1c736af248a86eb4 Mon Sep 17 00:00:00 2001 From: 58261 <58261@DESKTOP-AAAC71Q> Date: Tue, 16 Oct 2018 10:07:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=B0=83=E6=81=AF=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/bean/ConditionBean.java | 20 +++++++++++++++++++ .../tenwa/reckon/util/TransRateHelper.java | 16 ++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/bean/ConditionBean.java b/calc/com/tenwa/reckon/bean/ConditionBean.java index ff77eecb5..641d63845 100644 --- a/calc/com/tenwa/reckon/bean/ConditionBean.java +++ b/calc/com/tenwa/reckon/bean/ConditionBean.java @@ -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; + } + /** * *

ConditionBean ID。

diff --git a/calc/com/tenwa/reckon/util/TransRateHelper.java b/calc/com/tenwa/reckon/util/TransRateHelper.java index 67588ea57..3ec831167 100644 --- a/calc/com/tenwa/reckon/util/TransRateHelper.java +++ b/calc/com/tenwa/reckon/util/TransRateHelper.java @@ -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; } /** From 3aa26400291a8df5089b327ff2677fdec9e86245 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 16 Oct 2018 10:11:18 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceImp/CreateVoucherServiceImpl.java | 1 + .../serviceImp/ExprotVoucherToXML.java | 244 ++++++++++++++++++ .../voucher/serviceImp/VoucherToV8Impl.java | 2 +- 3 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 77bc9ab06..d5112ef2a 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -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)) { diff --git a/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java b/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java new file mode 100644 index 000000000..964133a36 --- /dev/null +++ b/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java @@ -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 map = new HashMap(); // 参数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> 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 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> A1 = DataOperatorUtil.getDataBySql(Sqlca,AUXILIARYSQL,map); + for (Map 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"; + } + +} diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index 4a84f24b0..1ab09a24d 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -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")); From 7afb0ddf1711987a2313604ea8987be0b7f7f365 Mon Sep 17 00:00:00 2001 From: 58261 <58261@DESKTOP-AAAC71Q> Date: Tue, 16 Oct 2018 10:44:47 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=82=AC=E6=94=B6=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overduedunning/DayDistribute.jsp | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp index 26ac2478a..31ef70781 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp @@ -7,6 +7,8 @@ */ ASObjectModel doTemp = new ASObjectModel("DayDistribute"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + ASDataObject ado = dwTemp.getDataObject(); + ado.setReadOnly("INPUT_myiframe0_end_day_2_2", true); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "0"; //只读模式 dwTemp.setPageSize(10); @@ -21,21 +23,11 @@ }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>