From 99d6166ab9c677b52187faba3295be0cf47f6c6b Mon Sep 17 00:00:00 2001 From: zhangjun Date: Wed, 19 Sep 2018 16:32:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B5=84=E6=96=99=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/DocListMain.jsp | 2 +- WebContent/Tenwa/Comm/DocList/PayDocList.jsp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp index 24c6a31ea..47d672065 100644 --- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp +++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp @@ -40,7 +40,7 @@ var docList="<%=docList%>"; myleft.width=1; if("SingleRow"=="<%=type%>"){ - if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"){ + if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"){ AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right",""); }else{ AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right",""); diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp index 8a284d218..fcebf0f5f 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp @@ -43,7 +43,9 @@ } String compClientID = request.getParameter("CompClientID"); - + if("ProjectRecreditFlow".equals(sObjectType)){ + sTempletNo = "FlowPayDocList" ; + } Map docParam=new HashMap(); Map other=new HashMap(); other.put("carAttributes", carAttributes); From 205e983768effee2255b6370cb2b4221ab58261c Mon Sep 17 00:00:00 2001 From: zhouyahui Date: Wed, 19 Sep 2018 20:07:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AC=AC=E4=B8=89=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index 0c6210e7d..98851aa90 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -220,7 +220,7 @@ public class FundFundPlanExecutor { if(!"business_product".equals(tcb.getProductType())) { if("N".equals(item.getItemDescribe())) continue; } else { - if("N".equals(item.getAttribute2())) continue; + if("N".equals(item.getAttribute3())) continue; } ffcp.setPlanDate(this.getPlanDate(StringUtil.nullToString(param.get("CostType02")), cb)); ffcp.setPlanMoney(temp.toString()); From d82a343c358863d9363ccabce8d4b0dd8eda8ab2 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 19 Sep 2018 20:48:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/voucher/voucherass_detail.jsp | 6 +- src_core/com/tenwa/util/SerialNumberUtil.java | 4 + .../service/VoucherSysJointNCService.java | 2 +- .../VoucherSysJointNCServiceImpl.java | 828 ++++++++++-------- 4 files changed, 450 insertions(+), 390 deletions(-) diff --git a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp index 363c2f383..34358e1cc 100644 --- a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp +++ b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp @@ -37,11 +37,7 @@ function NCInterface(){ alert("´«Ê俪ʼ"); var mes = RunJavaMethodTrans("com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl","sendVoucherData",""); - if("true"==mes){ - alert("´«Êä³É¹¦"); - }else{ - alert("´«Êäʧ°Ü"); - } + alert("´«ÊäÍê³É"); } function synVoucherCode(){ diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index 9005b54f1..04ae81e95 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -50,6 +50,10 @@ public class SerialNumberUtil { public static synchronized String getRentOutNoNumber(JBOTransaction tx) throws Exception{ return SerialNumberUtil.getSerialNumber("PR{year}{month}{maxOrderNumber}",4,null, "", null, tx); } + + public static synchronized String getVoucherPCNumber(JBOTransaction tx) throws Exception{ + return SerialNumberUtil.getSerialNumber("AP{year}{month}{day}-{maxOrderNumber}",3,null, "ƾ֤½Ó¿ÚÅú´Î", null, tx); + } /** * ͨÁª´ú¿ÛÁ÷Ë®ºÅ * @param tx diff --git a/src_core/com/tenwa/voucher/service/VoucherSysJointNCService.java b/src_core/com/tenwa/voucher/service/VoucherSysJointNCService.java index 956c3ea02..1e2d662c0 100644 --- a/src_core/com/tenwa/voucher/service/VoucherSysJointNCService.java +++ b/src_core/com/tenwa/voucher/service/VoucherSysJointNCService.java @@ -3,5 +3,5 @@ package com.tenwa.voucher.service; import com.amarsoft.are.jbo.JBOTransaction; public interface VoucherSysJointNCService { - public String sendVoucherData(JBOTransaction tx)throws Exception; + public void sendVoucherData(JBOTransaction tx)throws Exception; } diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java index e7ef8e3a0..0fab376c3 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java @@ -22,7 +22,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; -import org.apache.jasper.tagplugins.jstl.core.ForEach; import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; @@ -30,6 +29,7 @@ import org.dom4j.io.DocumentSource; import org.dom4j.io.OutputFormat; import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; +import org.junit.Test; import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.BizObject; @@ -43,6 +43,7 @@ import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.manage.NameManager; import com.sun.istack.internal.logging.Logger; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.util.SerialNumberUtil; import com.tenwa.voucher.service.VoucherSysJointNCService; import jbo.com.tenwa.entity.comm.own.OWN_INFO; import jbo.voucher.LV_STACTS_CONFIG; @@ -52,93 +53,57 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { /** * µ÷ÓÃÉú³ÉxmlµÄ·½·¨ */ - public String sendVoucherData(JBOTransaction tx){ - // »ñÈ¡·µ»Ø½á¹û, ÓÃÓÚÒ³ÃæÌáʾ - String trueOrFalse = getVoucherToXML(tx); - return trueOrFalse; - } - - /** - * ÏÈ»ñÈ¡V8ÊÓͼÖеÄƾ֤±àºÅ, È»ºóÒÀ´ÎÉú³ÉËùÐèxml - * @param tx - */ - public static String getVoucherToXML(JBOTransaction tx) { - try { - Transaction Sqlca = null; - Sqlca = Transaction.createTransaction(tx); - Map map = new HashMap(); - // »ñÈ¡vi_voucher_v8ÊÓͼÖеÄÊý¾Ý - List> list= getDataList(Sqlca);// »ñÈ¡ËùÓÐƾ֤±àºÅ - // Éú³Éƾ֤ÐÅÏ¢xmlÎļþ - DOM4JcreateToVoucher(Sqlca,list,map); - // Éú³É¿Í»§ÐÅÏ¢xmlÎļþ - DOM4JcreateToCustomer(Sqlca); - // Éú³É¾­ÏúÉÌÐÅÏ¢xmlÎļþ - DOM4JcreateToSupplier(Sqlca); - // Éú³É¸¨ÖúºÏͬÐÅÏ¢xmlÎļþ - DOM4JcreateToDefdoc(Sqlca); - tx.commit(); - } catch (Exception e) { - try { - tx.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - return "false"; - }finally { - try { - if(tx !=null){ - tx.commit(); - } - } catch (Exception e2) { - e2.printStackTrace(); } - } - return "true"; - } - /** - * »ñÈ¡Êý¾Ý¿âƾ֤ÐÅÏ¢±íËùÓеĴý´«F3ƾ֤±àºÅ - * @throws Exception - */ - private static List> getDataList(JBOTransaction tx) throws Exception{ - // ²éѯËùÓдý´«ÊäµÄÊý¾Ý - String sql = "SELECT F3,F60,ID,MODULE_NAME,DEPT_NAME,F1,F15,V8_STATUS,F5,GENERATE_DATE FROM VI_VOUCHER_V8 WHERE F3 NOT IN(SELECT F3 FROM VOUCHER_LOG WHERE FLAG = '1')"; - List> dataList = DataOperatorUtil.getDataBySql(tx, sql, null);// ½«ËùÓÐƾ֤ºÅ·â×°µ½list¼¯ºÏÖÐ - return dataList; + public void sendVoucherData(JBOTransaction tx){ + // Éú³Éƾ֤ÐÅÏ¢xmlÎļþ + DOM4JcreateToVoucher(tx); + // Éú³É¿Í»§ÐÅÏ¢xmlÎļþ + DOM4JcreateToCustomer(tx); + // Éú³É¾­ÏúÉÌÐÅÏ¢xmlÎļþ + DOM4JcreateToSupplier(tx); + // Éú³É¸¨ÖúºÏͬÐÅÏ¢xmlÎļþ + DOM4JcreateToDefdoc(tx); } /** * ƾ֤ÐÅÏ¢xmlÉú³É, ÿ1000ÌõÉú³ÉÒ»¸öxml * @throws Exception */ - private static void DOM4JcreateToVoucher(Transaction Sqlca,List>list, Map map) throws Exception { + private static void DOM4JcreateToVoucher(JBOTransaction tx){ // ±¾µØxml´æ·ÅÎļþ¼Ð, ûÓоʹ´½¨ - /*File file2 = new File("D:\\voucherXml_NC"); - if (!file2.exists()) {file2.mkdirs();}// ÅжÏÊÇ·ñ´æÔÚ, Èç¹û²»´æÔھʹ´½¨¸ÃÎļþ¼Ð -*/ // ¶¨ÒåÈ«¾Ö¶ÔÏó + // File file2 = new File("D:\\voucherXml_NC"); + // if (!file2.exists()) {file2.mkdirs();}// ÅжÏÊÇ·ñ´æÔÚ, Èç¹û²»´æÔھʹ´½¨¸ÃÎļþ¼Ð + Transaction Sqlca = null; + try { + // ¶¨ÒåÈ«¾Ö¶ÔÏó + Sqlca = Transaction.createTransaction(tx); + Map map = new HashMap(); Document document=null; // xmlÎļþÍ· File file=null; // Éú³ÉµÄxmlÎļþ·¾¶ XMLWriter writer=null; // Êä³ö¶ÔÏó - String str=""; // xmlÖ÷¼üid + String uuid=""; // xmlÖ÷¼üid String SUBJECT_ID=null; // »ñÈ¡¿ÆÄ¿id String OWNED_COMPANY = null; // ËùÊô¹«Ë¾ String ACC_YEAR = null; // »á¼ÆÆÚ¼ä/Äê String ACC_MONTH = null; // »á¼ÆÆÚ¼ä/Ô - String tableName="VOUCHER_LOG"; // ±íÃû String insertSql=""; // ¶¨ÒåÐÂÔöÓï¾ä¶ÔÏó - SqlObject sqlObject=null; // sqlObject¶ÔÏó - Date time = new Date(); // »ñÈ¡µ±Ç°Ê±¼ä¶ÔÏó, ²¢¸ñʽ»¯ - SimpleDateFormat formatter1 = new SimpleDateFormat("yyyyMMddHHmmss");// ÄêÔÂÈÕʱ·ÖÃë - SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// ÄêÔÂÈÕʱ·ÖÃë - String year_month_day = formatter1.format(time); // ÄêÔÂÈÕʱ·ÖÃë - String year_month_days = formatter2.format(time); // ÄêÔÂÈÕʱ·ÖÃë + String type="voucher"; // ¼Ç¼±íÀà±ð String timeAll = ""; // ÖƵ¥ÈÕÆÚ + + String year_month_day = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String year_month_days = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + + // ²éѯƾ֤ÊÓͼ, »ñȡÿÌõƾ֤ + String sql = "SELECT F3,F60,ID,MODULE_NAME,DEPT_NAME,F1,F15,V8_STATUS,F5,GENERATE_DATE FROM VI_VOUCHER_V8 WHERE F3 NOT IN(SELECT TABLE_NUM FROM NCXML_DETAIL_RECORDS WHERE FLAG = '1' AND XML_TYPE='"+type+"')"; + List> list = DataOperatorUtil.getDataBySql(Sqlca, sql, null);// ½«ËùÓÐƾ֤ºÅ·â×°µ½list¼¯ºÏÖÐ + int a = list.size(); // v8ÊÓͼ×ÜÊý¾ÝÁ¿/ xmlÖÐÉú³ÉµÄ×ÜÌõÊý int b=1000; // ÉèÖõ±Ç°xmlÉú³ÉµÄÌõÊý int c = (int)(a / b); // »ñÈ¡Éú³ÉxmlÎļþµÄÊýÁ¿, ×î´óÑ­»·Öµ=c+1 for (int i = 0; i <=c; i++) { + int count=0; // ¼Ç¼µ±Ç°Åú´Î´«Êä×ÜÁ¿ + Sqlca = Transaction.createTransaction(tx); document = DocumentHelper.createDocument(); // ´´½¨Document¶ÔÏó Element root = document.addElement("ufinterface"); // ÉèÖÃxmlÍ· - root.addAttribute("account", "0001"); // ÉèÖÃxmlÍ·ÊôÐÔ + root.addAttribute("account", "q0225"); // ÉèÖÃxmlÍ·ÊôÐÔ root.addAttribute("billtype", "vouchergl"); root.addAttribute("businessunitcode", "develop"); root.addAttribute("filename", ""); @@ -149,14 +114,17 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { root.addAttribute("replace", "Y"); root.addAttribute("roottag", ""); root.addAttribute("sender", "001"); + String batch = SerialNumberUtil.getVoucherPCNumber(Sqlca); for (int x = i * b; x < (i + 1) * b && x < a; x++) { // ¾ö¶¨µ±Ç°xmlÉú³ÉµÄÊý¾ÝÁ¿ // »ñȡƾ֤±àºÅ String F3=list.get(x).get("F3"); map.clear(); map.put("F3",F3); + // »ñÈ¡v8±í½è·½Êý¾Ý String sql1 = "SELECT f7,f6,f5,f15,f63,f64,f73,f74,f75,f76 FROM VOUCHER_V8 WHERE F3=:F3 AND ENTRYDC='1'"; List> v1 = DataOperatorUtil.getDataBySql(Sqlca,sql1,map); + // »ñÈ¡v8±í´û·½Êý¾Ý String sql2 = "SELECT f8,f6,f5,f15,f63,f64,f73,f74,f75,f76,f49,f51,f52,f12 FROM VOUCHER_V8 WHERE F3=:F3 AND ENTRYDC='-1'"; List> v2 = DataOperatorUtil.getDataBySql(Sqlca,sql2,map); @@ -168,12 +136,15 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { ACC_MONTH =map2.get("f52"); // »á¼ÆÆÚ¼ä/Ô timeAll =map2.get("f15"); // ÖƵ¥Ê±¼ä } + + // »ñÈ¡±¾·½ÐÅÏ¢ BizObject own = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME, "id=:OWNED_COMPANY").setParameter("OWNED_COMPANY", OWNED_COMPANY).getSingleResult(false); + Element voucher = root.addElement("voucher"); Element voucherHead = voucher.addElement("voucher_head"); Element pkVoucher = voucherHead.addElement("pk_voucher");// ƾ֤Ö÷¼ü/·Ç¿Õ - str=UUID.randomUUID().toString().replace("-", ""); - pkVoucher.setText(str); + uuid=UUID.randomUUID().toString().replace("-", ""); + pkVoucher.setText(uuid); Element pk_vouchertype = voucherHead.addElement("pk_vouchertype");// ƾ֤Àà±ð, ĬÈÏ01/·Ç¿Õ pk_vouchertype.setText("1");//---------------------------------------------------------------------- Element year = voucherHead.addElement("year");// »á¼ÆÄê¶È/·Ç¿Õ @@ -323,6 +294,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element pk_innercorp1 = cashFlow_item1.addElement("pk_innercorp");// ÄÚ²¿µ¥Î»Ö÷¼ü,×î´ó³¤¶ÈΪ64,ÀàÐÍΪ:String pk_innercorp1.setText(""); } + // Ñ­»·´û·½¼¯ºÏ, °´ÕÕv8±íÊý¾ÝÖÐÉú³ÉÏàÓ¦µÄ½è·½item for (Map v8loan : v2) { // ¸ù¾Ý¿ÆÄ¿id, »ñÈ¡µ±Ç°Êý¾Ý¶ÔÓ¦µÄ¿ÆÄ¿ÐÅÏ¢ @@ -423,12 +395,14 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element pk_innercorp2 = cashflowitem2.addElement("pk_innercorp");// ÄÚ²¿µ¥Î»Ö÷¼ü,×î´ó³¤¶ÈΪ64,ÀàÐÍΪ:String pk_innercorp2.setText(""); } - // ÐÂÔöµ±Ìõƾ֤ÐÅÏ¢Èçvoucher_log±í - insertSql="INSERT INTO VOUCHER_LOG(BILLID,F3,FLAG,CREATE_TIME) VALUES('"+str+"','"+F3+"','1','"+year_month_days+"')"; + // ÐÂÔöµ±Ìõƾ֤ÐÅÏ¢Èë¼Ç¼×Ö±í + //insertSql="INSERT INTO VOUCHER_LOG(BILLID,F3,FLAG,CREATE_TIME,BATCH) VALUES('"+str+"','"+F3+"','1','"+year_month_days+"','"+batch+"')"; + insertSql="INSERT INTO NCXML_DETAIL_RECORDS(BILLID,XML_TYPE,TABLE_NUM,FLAG,CREATE_TIME,BATCH) VALUES('"+uuid+"','"+type+"','"+F3+"','1','"+year_month_days+"','"+batch+"')"; //sqlObject = new SqlObject(insertSql); //Sqlca.executeSQL(sqlObject); Sqlca.executeSQL(insertSql); logger.info("ƾ֤¼Ç¼±í²åÈëÓï¾ä: "+insertSql); + count++; } String URL="//data//files//apzl_leasing//tmp//XZW//APleasing_VOUCHER_"+year_month_day+".xml"; //String URL="D:\\voucherXml_NC\\APleasing_VOUCHER_"+year_month_day+".xml"; @@ -437,181 +411,196 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { writer.setEscapeText(false);// ×Ö·ûÊÇ·ñתÒå,ĬÈÏtrue writer.write(document); writer.close(); - InterActionToNC(Sqlca,URL,tableName); + InterActionToNC(Sqlca,URL,type,batch,count); + Sqlca.commit(); } + } catch (Exception e) { + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } } /** * ¿Í»§ÐÅÏ¢xmlÉú³É, ÿ1000ÌõÉú³ÉÒ»¸öxml * @throws Exception * @throws Exception */ - private static void DOM4JcreateToCustomer(Transaction Sqlca) throws Exception{ - // ÅжϸÃÎļþ¼ÐÊÇ·ñ´æÔÚ, Èç¹û²»´æÔھʹ´½¨ - /*File file2 = new File("D:\\voucherXml_NC"); - if(file2.exists()) {file2.mkdirs();} */ - // ¶¨ÒåÈ«¾Ö¶ÔÏó - // Éú³ÉxmlµÄ·¾¢ - File file=null; - // Êä³ö¶ÔÏó - XMLWriter writer=null; - // ±íÃû - String tableName="CUSTOMER_LOG"; + private static void DOM4JcreateToCustomer(JBOTransaction tx){ + Transaction Sqlca = null; + try { + Sqlca = Transaction.createTransaction(tx); + File file=null; // ¶¨ÒåÎļþ¶ÔÏó + XMLWriter writer=null; // ¶¨ÒåÊä³ö¶ÔÏó + String type="customer"; // ¶¨ÒåxmlÀàÐͶÔÏó String insertSql=""; // ¶¨ÒåÐÂÔöÓï¾ä¶ÔÏó - SqlObject sqlObject=null; // sqlObject¶ÔÏó - // »ñȡʱ¼ä¶ÔÏó, ¸ñʽΪ--ÄêÔÂÈÕʱ·ÖÃë - Date time = new Date(); // »ñÈ¡µ±Ç°Ê±¼ä¶ÔÏó, ²¢¸ñʽ»¯ - SimpleDateFormat formatter1 = new SimpleDateFormat("yyyyMMddHHmmss");// ÄêÔÂÈÕʱ·ÖÃë - SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// ÄêÔÂÈÕʱ·ÖÃë - String year_month_day = formatter1.format(time); // ÄêÔÂÈÕʱ·ÖÃë - String year_month_days = formatter2.format(time); // ÄêÔÂÈÕʱ·ÖÃë - String str=""; - String customer_num=""; - String customername=""; - String customertype=""; - // ²éѯδ´«Èë¿Í»§ÐÅÏ¢ - String sql="SELECT customer_num,customername,customertype,customerid FROM CUSTOMER_INFO WHERE customer_num NOT IN(SELECT CUSTOMER_NUM FROM CUSTOMER_LOG WHERE FLAG='1') "; + String uuid=""; // ¶¨Òåxml´«Êäid¶ÔÏó + String customer_num=""; // ¶¨Òå¿Í»§±àºÅ¶ÔÏó + String customername=""; // ¶¨Òå¿Í»§Ãû³Æ¶ÔÏó + String customertype=""; // ¶¨Òå¿Í»§ÀàÐͶÔÏó + + // »ñÈ¡Ìض¨¸ñʽÈÕÆÚ + String year_month_day = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String year_month_days = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + + // ²éѯΪ´«Êä»ò֮ǰ´«Êäʧ°ÜµÄÊý¾Ý + String sql="SELECT customer_num,customername,customertype,customerid FROM CUSTOMER_INFO WHERE customer_num NOT IN(SELECT TABLE_NUM FROM NCXML_DETAIL_RECORDS WHERE FLAG='1' AND XML_TYPE='"+type+"') "; List> rs = DataOperatorUtil.getDataBySql(Sqlca,sql,null); - // ¿Í»§xmlÍ· - Document document= DocumentHelper.createDocument(); // Éú³Éÿ¸öxmlµÄÍ· + + // Éú³ÉxmlÍ· + Document document= DocumentHelper.createDocument(); Element root = document.addElement("ufinterface"); - root.addAttribute("account", "0001"); - root.addAttribute("billtype", "customer"); - root.addAttribute("businessunitcode", "develop"); - root.addAttribute("filename", ""); - root.addAttribute("groupcode", "001"); - root.addAttribute("isexchange", "Y"); - root.addAttribute("orgcode", ""); - root.addAttribute("receiver", "½ÓÊÕ·½ÒµÎñµ¥Ôª±àÂë"); - root.addAttribute("replace", "Y"); - root.addAttribute("roottag", ""); - root.addAttribute("sender", "001"); + root.addAttribute("account", "q0225"); + root.addAttribute("billtype", "customer"); + root.addAttribute("businessunitcode", "develop"); + root.addAttribute("filename", ""); + root.addAttribute("groupcode", "001"); + root.addAttribute("isexchange", "Y"); + root.addAttribute("orgcode", ""); + root.addAttribute("receiver", "½ÓÊÕ·½ÒµÎñµ¥Ôª±àÂë"); + root.addAttribute("replace", "Y"); + root.addAttribute("roottag", ""); + root.addAttribute("sender", "001"); + + String batch = SerialNumberUtil.getVoucherPCNumber(Sqlca);// Éú³ÉÅú´ÎºÅ + + // ±éÀúÒª´«ÊäµÄ½á¹û¼¯ for(int i=0;i ÖÁ ɾ³ý£¬°üÀ¨ ºÍ Element item1 = finances.addElement("item"); @@ -741,15 +730,8 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { acclimitcontrol.setText("»ùÓÚÉϼ¶¿Í»§ÕËÆÚ¿ØÖÆ,×î´ó³¤¶ÈΪ1,ÀàÐÍΪ:UFBoolean"); Element creditlevel = item4.addElement("creditlevel");// ÐÅÓõȼ¶,×î´ó³¤¶ÈΪ20,ÀàÐÍΪ:String creditlevel.setText("ÐÅÓõȼ¶,×î´ó³¤¶ÈΪ20,ÀàÐÍΪ:String");*/ - /*cust_id=rs.get(i).get("customerid"); - updateSql="UPDATE CUSTOMER_INFO SET FLAG='0' WHERE CUSTOMERID='"+cust_id+"'"; - SqlObject updSql=new SqlObject(updateSql); - Sqlca.executeSQL(updSql);*/ - // ½«¿Í»§xmlÐÅϢдÈë״̬±íÖÐ - insertSql="INSERT INTO CUSTOMER_LOG(BILLID,CUSTOMER_NUM,FLAG,CREATE_TIME) VALUES('"+str+"','"+customer_num+"','1','"+year_month_days+"')"; - //sqlObject = new SqlObject(insertSql); - //Sqlca.executeSQL(sqlObject); + insertSql="INSERT INTO NCXML_DETAIL_RECORDS(BILLID,XML_TYPE,TABLE_NUM,FLAG,CREATE_TIME,BATCH) VALUES('"+uuid+"','"+type+"','"+customer_num+"','1','"+year_month_days+"','"+batch+"')"; Sqlca.executeSQL(insertSql); logger.info("¿Í»§¼Ç¼Óï¾ä: "+insertSql); } @@ -760,21 +742,38 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { writer.setEscapeText(false);// ×Ö·ûÊÇ·ñתÒå,ĬÈÏtrue writer.write(document); writer.close(); - InterActionToNC(Sqlca,URL,tableName); + InterActionToNC(Sqlca,URL,type,batch,rs.size()); + Sqlca.commit(); + } catch (Exception e) { + try { + logger.debug("¿Í»§xml´«Êäʧ°Ü"); + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if (Sqlca!=null) { + try { + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } } /** * ¹©Ó¦ÉÌÐÅÏ¢xmlÉú³É, ÿ1000ÌõÉú³ÉÒ»¸öxml * @throws Exception * @throws Exception */ - private static void DOM4JcreateToSupplier(Transaction Sqlca) throws Exception{ - //File file2 = new File("D:\\voucherXml_NC"); - //if(file2==null || "".equals(file2)) { - // file2.mkdirs();//´´½¨¸¸Îļþ¼Ð - //} - File file = null; - XMLWriter writer = null; - String tableName="DISTRIBUTOR_LOG"; // ±íÃû + private static void DOM4JcreateToSupplier(JBOTransaction tx) { + Transaction Sqlca = null; + try { + Sqlca = Transaction.createTransaction(tx); + File file = null; // Îļþ¶ÔÏó + XMLWriter writer = null; // Êä³ö¶ÔÏó + String type="distributor"; // xmlÀà±ð String DISTRIBUTOR_NAME = ""; // ¾­ÏúÉÌÃû³Æ String DISTRIBUTOR_CODING = ""; // ¾­ÏúÉÌid String DISTRIBUTOR_ADDRESS=""; // µØÇø±àÂë @@ -788,187 +787,188 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { String TYPE=""; // ¹©Ó¦ÉÌ»ù±¾·ÖÀà String BUSINESS_LICENSE_NO=""; // ×éÖ¯»ú¹¹´úÂë String DISTRIBUTOR_STATUS=""; // ÆôÓÃ״̬ - String FAX_NUMBER=""; // ÆôÓÃ״̬ - String E_MAIL=""; // ´«Õæ + String FAX_NUMBER=""; // ´«Õæ + String E_MAIL=""; // email String REGISTERED_ASSET=""; // ×¢²á×ʽð String DISTRIBUTORER=""; // ·¨ÈË String URL=""; // ÍøÖ· String insertSql=""; // ÐÂÔöÓï¾ä - SqlObject sqlObject=null; // ´´½¨sqlObject¶ÔÏó String uuid=""; // uuid String MBAFC_EARLYDISBURSEMENT_TYPE="";// ×ʽðÀàÐÍ/Ö§¸¶ÀàÐÍ - // »ñȡʱ¼ä¶ÔÏó, ¸ñʽΪ--ÄêÔÂÈÕʱ·ÖÃë - Date time = new Date(); // »ñÈ¡µ±Ç°Ê±¼ä¶ÔÏó, ²¢¸ñʽ»¯ - SimpleDateFormat formatter1 = new SimpleDateFormat("yyyyMMddHHmmss");// ÄêÔÂÈÕʱ·ÖÃë - SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// ÄêÔÂÈÕʱ·ÖÃë - String year_month_day = formatter1.format(time); // ÄêÔÂÈÕʱ·ÖÃë - String year_month_days = formatter2.format(time); // ÄêÔÂÈÕʱ·ÖÃë + + // »ñÈ¡Ìض¨ÈÕÆÚ + String year_month_day = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String year_month_days = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + // ÉèÖÃxml±êÇ©Í· - Document document = DocumentHelper.createDocument(); // Éú³Éÿ¸öxmlµÄÍ· + Document document = DocumentHelper.createDocument(); Element root = document.addElement("ufinterface"); - root.addAttribute("account", "0001"); - root.addAttribute("billtype", "supplier"); - root.addAttribute("filename", ""); - root.addAttribute("groupcode", "001"); - root.addAttribute("isexchange", "Y"); - root.addAttribute("receiver", "½ÓÊÕ·½ÒµÎñµ¥Ôª±àÂë"); - root.addAttribute("replace", "Y"); - root.addAttribute("roottag", ""); - root.addAttribute("sender", "001"); - String sql="SELECT DISTRIBUTOR_NAME,DISTRIBUTOR_CODING,DISTRIBUTOR_ADDRESS,FACT_ADDR,PROVINCES,POSTCODE,REGISTERED_ADDR,BUSINESS_SCOPE,SUBSIDIARY_COMPANY,TYPE,BUSINESS_LICENSE_NO,DISTRIBUTOR_STATUS,E_MAIL,FAX_NUMBER,REGISTERED_ASSET,DISTRIBUTORER,MBAFC_EARLYDISBURSEMENT_TYPE,URL FROM DISTRIBUTOR_INFO WHERE DISTRIBUTOR_CODING NOT IN(SELECT DISTRIBUTOR_CODING FROM DISTRIBUTOR_LOG WHERE FLAG ='1' ) "; + root.addAttribute("account", "q0225"); + root.addAttribute("billtype", "supplier"); + root.addAttribute("filename", ""); + root.addAttribute("groupcode", "001"); + root.addAttribute("isexchange", "Y"); + root.addAttribute("receiver", "½ÓÊÕ·½ÒµÎñµ¥Ôª±àÂë"); + root.addAttribute("replace", "Y"); + root.addAttribute("roottag", ""); + root.addAttribute("sender", "001"); + + // »ñȡδ´«Êä¼°ÒÔÇ°´«Êäʧ°ÜµÄÊý¾Ý + String sql="SELECT DISTRIBUTOR_NAME,DISTRIBUTOR_CODING,DISTRIBUTOR_ADDRESS,FACT_ADDR,PROVINCES,POSTCODE,REGISTERED_ADDR,BUSINESS_SCOPE,SUBSIDIARY_COMPANY,TYPE,BUSINESS_LICENSE_NO,DISTRIBUTOR_STATUS,E_MAIL,FAX_NUMBER,REGISTERED_ASSET,DISTRIBUTORER,MBAFC_EARLYDISBURSEMENT_TYPE,URL FROM DISTRIBUTOR_INFO WHERE DISTRIBUTOR_CODING NOT IN(SELECT TABLE_NUM FROM NCXML_DETAIL_RECORDS WHERE FLAG ='1' AND XML_TYPE='"+type+"') "; List> rs = DataOperatorUtil.getDataBySql(Sqlca,sql,null); + + // »ñÈ¡Åú´ÎºÅ + String batch = SerialNumberUtil.getVoucherPCNumber(Sqlca); + + // ±éÀúÒª´«ÊäµÄ½á¹û¼¯ for(int i=0; i> rs = DataOperatorUtil.getDataBySql(Sqlca,sql,null); + + // »ñÈ¡Åú´ÎºÅ + String batch = SerialNumberUtil.getVoucherPCNumber(Sqlca); + + // ±éÀú½á¹û¼¯ for (Map map : rs) { contract_number=(map.get("CONTRACT_NUMBER")==null)?"":map.get("CONTRACT_NUMBER"); contract_name=(map.get("PRODUCT_NAME")==null)?"":map.get("PRODUCT_NAME"); + ID=(map.get("ID")==null)?"":map.get("ID"); + Element bill = root.addElement("bill"); uuid=UUID.randomUUID().toString().replace("-", ""); bill.addAttribute("id", uuid); Element billhead = bill.addElement("billhead"); Element pk_defdoclist = billhead.addElement("pk_defdoclist");// ×Ô¶¨Òåµµ°¸ÁбíÖ÷¼ü,×î´ó³¤¶ÈΪ20,ÀàÐÍΪ:String - pk_defdoclist.setText("×Ô¶¨Òåµµ°¸ÁбíÖ÷¼ü,×î´ó³¤¶ÈΪ20,ÀàÐÍΪ:String"); + pk_defdoclist.setText(ID); Element pk_defdoc = billhead.addElement("pk_defdoc");// pk_defdoc.setText(""); Element pk_group = billhead.addElement("pk_group");// ËùÊô¼¯ÍÅ,×î´ó³¤¶ÈΪ20,ÀàÐÍΪ:String @@ -1044,8 +1074,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element memo = billhead.addElement("memo");// ±¸×¢,×î´ó³¤¶ÈΪ200,ÀàÐÍΪ:String memo.setText(""); // ½«¼Ç¼дÈ븨ÖúºÏͬÈÕÖ¾±í - insertSql="INSERT INTO SUBSIBIARY_CONTRACT_LOG(BILLID,CONTRACT_NUMBER,FLAG,CREATE_TIME) VALUES('"+uuid+"','"+contract_number+"','1','"+year_month_days+"')"; - //sqlObject= new SqlObject(insertSql); + insertSql="INSERT INTO NCXML_DETAIL_RECORDS(BILLID,XML_TYPE,TABLE_NUM,FLAG,CREATE_TIME,BATCH) VALUES('"+uuid+"','"+type+"','"+contract_number+"','1','"+year_month_days+"','"+batch+"')"; Sqlca.executeSQL(insertSql); logger.info("¸¨ÖúºÏͬ¼Ç¼Óï¾ä: " + insertSql); } @@ -1056,32 +1085,50 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { writer.setEscapeText(false);// ×Ö·ûÊÇ·ñתÒå,ĬÈÏtrue writer.write(document); writer.close(); - InterActionToNC(Sqlca,URL,tableName); + InterActionToNC(Sqlca,URL,type,batch,rs.size()); + Sqlca.commit(); + } catch (Exception e) { + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } } /** * ÏñNC´«Êäxml, »ñÈ¡NC»ØÖ´xmlÐÅÏ¢, ¸ù¾Ý»ØÖ´ÐÅÏ¢¸ü¸Ä״̬ */ - public static void InterActionToNC(Transaction Sqlca,String inputURL,String tableName) { + public static void InterActionToNC(Transaction Sqlca,String inputURL,String type,String batch,int count) { try { - // ¶¨ÒåÈ«¾Ö±äÁ¿ - String sql=""; - String resultcode=""; //·µ»Ø״̬ - String bdocid=""; //Êý¾ÝID + String updateSql = ""; // ¸üÐÂsql¶ÔÏó + String insertSql = ""; // ÐÂÔöSQL¶ÔÏó + String deleteSql = ""; // ɾ³ýSQL¶ÔÏó + String resultcode= ""; // µ¥Ìõ·µ»Ø½á¹û + String bdocid = ""; // xml»ØÖ´id String resultdescription=""; //´íÎóÐÅÏ¢ - SqlObject updSql; /** * »ñÈ¡¶Ô·½postÁ¬½Ó */ - String url = "http://172.16.0.19/service/XChangeServlet?account=00001&groupcode=001"; + String url = "http://47.93.227.86:8858/service/XChangeServlet?account=q0225&groupcode=001"; URL realURL = new URL(url); HttpURLConnection connection = (HttpURLConnection)realURL.openConnection(); connection.setDoOutput(true); connection.setRequestProperty("Content-type", "text/xml"); connection.setRequestMethod("POST"); + /** - * ¶ÁÈ¡±¾µØÉú³ÉµÄxml, ´«Êäµ½NC + * ¶ÁÈ¡±¾·½Éú³ÉµÄxml, ´«Êäµ½NC */ File file = new File(inputURL); BufferedOutputStream out = new BufferedOutputStream(connection.getOutputStream()); @@ -1093,8 +1140,9 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { } input.close(); out.close(); + /** - * »ñÈ¡»ØÖ´ÐÅÏ¢ + * »ñÈ¡NC»ØÖ´ÐÅÏ¢ */ InputStream inputStream = connection.getInputStream(); InputStreamReader isr = new InputStreamReader(inputStream); @@ -1107,8 +1155,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { } input.close(); System.out.println("--------------------------" + xmlString); - String insertSql1="INSERT INTO LB_XZW_LOG(ID_,NAME_) VALUES('"+tableName+"','³É¹¦')"; - Sqlca.executeSQL(insertSql1); + /** * ½«»ñÈ¡µ½µÄ»ØÖ´ÐÅÏ¢Éú³É±¾µØxml */ @@ -1119,15 +1166,17 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //ÉèÖÃÎĵµµÄ»»ÐÐÓëËõ½ø transformer.setOutputProperty(OutputKeys.INDENT, "YES"); + // ½«»ØÖ´ÐÅÏ¢Êä³öµ½±¾µØ SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHHmmss"); - /*File file2 = new File("D:\\voucherXml_receipt"); - if (!file2.exists()) {file2.mkdirs();}// ÅжÏÊÇ·ñ´æÔÚ, Èç¹û²»´æÔھʹ´½¨¸ÃÎļþ¼Ð*/ - String resFile = "//data//files//apzl_leasing//tmp//WEN"+fmt.format(new Date())+".xml"; + SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// ÄêÔÂÈÕʱ·ÖÃë + //File file2 = new File("D:\\VOUCHER_RECEIPT"); + //if (!file2.exists()) {file2.mkdirs();}// ÅжÏÊÇ·ñ´æÔÚ, Èç¹û²»´æÔھʹ´½¨¸ÃÎļþ¼Ð + String resFile = "//data//files//apzl_leasing//tmp//WEN//APleasing_"+type+""+fmt.format(new Date())+".xml"; + //String resFile = "D:\\VOUCHER_RECEIPT\\APleasing_"+type+""+fmt.format(new Date())+".xml"; StreamResult result = new StreamResult(new File(resFile)); transformer.transform(source,result); - String insertSql="INSERT INTO LB_XZW_LOG(ID_,NAME_) VALUES('2','³É¹¦')"; - Sqlca.executeSQL(insertSql); + /** * ½âÎöxml, ¸ù¾Ý»ØÖ´ÐÅÏ¢¸üÐÂ״̬ */ @@ -1139,28 +1188,39 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { //ºóÃæ¶Ô»ØÖ´½á¹û×öÅжÏ,È»ºó¸Ä±äµ¼Èë״̬¾ÍÐÐÁË if(null != resSuc){ if(resSuc.equals("N")){ - logger.info("µ¼Èëʧ°Ü"); + logger.info("µ¼Èëʧ°Ü"); + // µ¼Èëʧ°Ü, ½«±¾´ÎÔÚÃ÷ϸ±íÖд洢µÄÊý¾Ýɾ³ý + deleteSql = "DELETE FROM NCXML_DETAIL_RECORDS WHERE BATCH='"+batch+"' AND XML_TYPE = '"+type+"'"; + // µ¼Èëʧ°Ü, ½«Ê§°ÜÊý¾Ý¼Ç¼Èë×ܼǼ±í + insertSql = "INSERT INTO NCXML_TOTAL_RECORDS(ID_,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,CREATETIME) VALUES('"+batch+"','"+type+"','"+resSuc+"','"+count+"','"+count+"','"+formatter2.format(new Date())+"')"; + Sqlca.executeSQL(deleteSql); + Sqlca.executeSQL(insertSql); }else if(resSuc.equals("Y")){ logger.info("µ¼Èë³É¹¦"); - /*sql="UPDATE "+tableName+" SET FLAG = '1' WHERE flag <> '1'"; - updSql = new SqlObject(sql); - Sqlca.executeSQL(updSql);*/ - List list1 = root.elements(); - for (Element element : list1) { - List list = element.elements(); - for (Element el : list) { + List list = root.elements(); + int failed_count=0; // ʧ°Ü¼Ç¼Êý + for (Element element : list) { + List list2 = element.elements(); + for (Element el : list2) { + logger.info("111111111111111111"); + // »ñÈ¡µ¥Ìõ»Øִ״̬ resultcode = el.element("resultcode").getStringValue(); if(!"1".equals(resultcode)) { - bdocid = el.element("bdocid").getStringValue();// xml»ØÖ´id - resultdescription = el.element("resultdescription").getStringValue();// ´íÎóÐÅÏ¢ - //sql=" UPDATE "+tableName+" SET FLAG='"+resultcode+"',ERR_DESCRIBE='"+resultdescription+"' WHERE BUILLID='"+bdocid+"' "; - sql=" UPDATE "+tableName+" SET FLAG='2',ERR_DESCRIBE='"+resultdescription+"' WHERE BUILLID='"+bdocid+"' "; - //updSql = new SqlObject(sql); - Sqlca.executeSQL(sql); - logger.info("¸ù¾Ý»ØÖ´ÐÅÏ¢, Ð޸Ĵ«Êäʧ°Ü״̬, ¼Ç¼´íÎóÐÅÏ¢"+sql); + logger.info("22222222222222"); + bdocid = el.element("bdocid").getStringValue(); // xml»ØÖ´id + resultdescription = el.element("resultdescription").getStringValue(); // ´íÎóÐÅÏ¢ + + // Èç¹û»Øִ״̬²»µÈÓÚ1, ˵Ã÷ÓÐÎó, ¸üе½¼Ç¼×Ö±í²¢¼Ç¼´íÎóÐÅÏ¢ + updateSql=" UPDATE NCXML_DETAIL_RECORDS SET FLAG='"+resultcode+"',ERR_DESCRIBE='"+resultdescription+"' WHERE BUILLID='"+bdocid+"' AND XML_TYPE= '"+type+"'"; + Sqlca.executeSQL(updateSql); + logger.info("¸ù¾Ý»ØÖ´ÐÅÏ¢, Ð޸Ĵ«Êäʧ°Ü״̬, ¼Ç¼´íÎóÐÅÏ¢"+updateSql); + failed_count++; } } } + // ½«±¾Åú´Î´«Êä×ÜÁ¿¼° ʧ°ÜÊýÁ¿¼Ç¼Èë¼Ç¼×ܱí + String insertSql1="INSERT INTO NCXML_TOTAL_RECORDS(ID_,XML_TYPE,FLAG_,COUNT_,FAILED_COUNT,CREATETIME) VALUES('"+batch+"','"+type+"','"+resSuc+"','"+count+"','"+failed_count+"','"+formatter2.format(new Date())+"')"; + Sqlca.executeSQL(insertSql1); }else{ logger.info("³öÏÖδ֪´íÎó"); } From 90e13ef94ad87ba49698124a2c61eb0b3c21dd0f Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 19 Sep 2018 21:41:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseFlowList/BaseFlowApplyListStart.jspf | 8 +- .../AssetsDisposalApplyList.jsp | 18 +- .../TriditionLCContractTerminateInfo.jsp | 164 ++++++++++++++++++ .../ContractOnhireChangeApplyList.jsp | 2 +- .../RentNotify/TriditionRentNotifyList.jsp | 8 +- WebContent/fileTemplate/租金支付通知书.docx | Bin 40264 -> 39357 bytes 6 files changed, 189 insertions(+), 11 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf index c519b4cae..26d3e3b37 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf @@ -36,8 +36,12 @@ doTemp.setVisible("CONTRACT_NO", true); } //doTemp.appendJboWhere(applyManager.getWhereClause()+" order by objectNo desc "); - //Èç¹ûÊÇÏîÄ¿Á¢ÏÔòÌí¼ÓÉêÇëÈËÊÇÖ÷ÉêÇëÈ˵ÄwhereÌõ¼þ - if("ProjectApproalApply".equals(sApplyType)||"ContractChangeApply".equals(sApplyType)||"ContractCancelApply".equals(sApplyType)){ + //Èç¹ûÊÇÏîÄ¿Á¢ÏÔòÌí¼ÓÉêÇëÈËÊÇÖ÷ÉêÇëÈ˵ÄwhereÌõ¼þTAssetsDisposalEndApply + if("ProjectApproalApply".equals(sApplyType)||"ContractChangeApply".equals(sApplyType)||"ContractCancelApply".equals(sApplyType) + ||"ContractOnhireChangeApply".equals(sApplyType)||"TriditionContractChangeApply".equals(sApplyType)||"ContractSupportApply".equals(sApplyType) + ||"ContractEndApply".equals(sApplyType)||"ProjectChangeApply".equals(sApplyType)||"ProjectCancelApply".equals(sApplyType)||"ProjectCreditApply".equals(sApplyType) + ||"FundPaymentApply".equals(sApplyType)||"ProjectRecreditApply".equals(sApplyType)||"ProjectSupportApply".equals(sApplyType)||"ContractApprovalApply".equals(sApplyType) + ||"TAssetsDisposalApply".equals(sApplyType)||"TAssetsDisposalEndApply".equals(sApplyType)||"TAssetsDisposalFeeApply".equals(sApplyType)){ doTemp.appendJboWhere(applyManager.getWhereClause()+" and cpt.is_main='Y'"); }else{ doTemp.appendJboWhere(applyManager.getWhereClause()); diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp index 821bced6a..07d3d9770 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp @@ -5,7 +5,23 @@ /*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/ function newApply() { - AsDialog.OpenSelector("SelectPaymentForAssetsDisposal","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var flowno="<%=CurPage.getParameter("ApplyType")%>"; + var selname=""; + var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var businessType=""; + if("AssetsDisposalApply"==flowno){ + businessType="1"; + }else{ + if(orgId=="8009011"){ + businessType="3"; + }else if(orgId=="8009010"){ + businessType="2"; + }else{ + alert("µ±Ç°Óû§²»ÄÜ·¢ÆðÉêÇ룡"); + return; + } + } + AsDialog.OpenSelector("SelectPaymentForAssetsDisposal","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡ return; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp new file mode 100644 index 000000000..afa43fa42 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp @@ -0,0 +1,164 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2017-06-26 + Content: ʾÀýÏêÇéÒ³Ãæ + History Log: + */ + + String flowunid = CurPage.getParameter("FlowUnid"); + String contractid = CurPage.getParameter("ContractId"); + String RightType = CurPage.getParameter("RightType");//Ñ¡Ôñģʽ + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); + + BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + String paymentnumber=condition.getAttribute("payment_number").getString(); + String contractId=condition.getAttribute("contract_id").getString(); + //»ñÈ¡ÏîÄ¿Î¥Ô¼½ð£¨Ö»Óд«Í³µÄÓУ© + String total_all = JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION","CONTRACT_ID=:contractid").setParameter("contractid", contractid).getSingleResult(false).getAttribute("TOTAL_ALL").getString(); + + BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); + String productId=flow.getAttribute("productId").getString(); + + String sTempletNo = "TriditionLCContractTerminate";//--Ä£°åºÅ-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.setDefaultValue("PAYMENT_NUMBER", paymentnumber); + doTemp.setHtmlEvent("PAYDAY_ADJUST","onchange","getTerminateInfo"); + doTemp.setHtmlEvent("REPURCHASE_RATIO","onchange","getRepurchaseMoney"); + + doTemp.setHtmlEvent("HANDLING_CHARGE","onchange","changeContract"); + doTemp.setHtmlEvent("AGREED_PENALTY","onchange","changeContract"); + doTemp.setHtmlEvent("AGREED_INTEREST","onchange","changeContract"); + doTemp.setHtmlEvent("COLLECT_FEES","onchange","changeContract"); + + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ + isShowButton=false; + }else{ + isShowButton=true; + } + dwTemp.genHTMLObjectWindow(flowunid); + + String sButtons[][] = { + {"true","","Button","ÌáÇ°½áÇå","ÌáÇ°½áÇå","saveRecord()","","","","btn_icon_settle"}, + {"true","","Button","³·Ïú½áÇå","³·Ïú½áÇå","cancelChange()","","","","btn_icon_delete"} + }; + 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/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp index ec3a8346a..cd5212213 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhireChange/ContractOnhireChangeApplyList.jsp @@ -9,7 +9,7 @@ var selname=""; var orgId="<%=CurUser.getOrgID()%>".substring(0,7); var businessType=""; - if("ContractOnhireCarChangeApply"==flowno){ + if("ContractOnhireCarChangeApply"==flowno||"ContractBasicInfoChangeApply"==flowno){ businessType="1"; }else{ if(orgId=="8009011"){ diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp index f43ac50af..ffc33d11e 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyList.jsp @@ -60,10 +60,6 @@ window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate"); } function generateQuotation(){ - /* var paymentnumber=getItemValue(0,getRow(0),"PAYMENT_NUMBER"); - var planlist=getItemValue(0,getRow(0),"PLAN_LIST"); - alert(sss); - return; */ var PAYMENT_NUMBERS=getItemValueArray(0,"PAYMENT_NUMBER"); var PLAN_LISTS=getItemValueArray(0,"PLAN_LIST"); @@ -77,7 +73,6 @@ var tempParam={}; var sparam=""; //Ä£°åºÅ - // param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87"; param["templateNo"]="372f9e55fae944a5964b6f6b1503c0c2"; //Éú³ÉÎļþ¹ØÁª¹Øϵ @@ -88,8 +83,7 @@ tempParam["PLAN_NUMBER"]=PAYMENT_NUMBERS[i]; tempParam["customername"]=customernames[i]; tempParam["contract_number"]=contract_numbers[i]; - - + //Éú³ÉÄ£°å¹Ì¶¨²ÎÊý tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>"; diff --git a/WebContent/fileTemplate/租金支付通知书.docx b/WebContent/fileTemplate/租金支付通知书.docx index 50d87fdf54af7018fd42a480e01f062239780dc7..0ad42898e9a14a3253af4dcf591f36b2fcdb6827 100644 GIT binary patch delta 9304 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 dEl{F#A#f)>R4bhid_)h8Pp3ynN%;@pe*yQ-k Date: Thu, 20 Sep 2018 09:26:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9B=B8=E5=85=B3=E5=8F=91=E8=B5=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetsDisposalApplyList.jsp | 2 +- .../AssetsDisposalFeeApplyList.jsp | 18 +++++++- .../businessApplyForfengxian.java | 45 +++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/businessApplyForfengxian.java diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp index 07d3d9770..edba0ca80 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp @@ -12,7 +12,7 @@ if("AssetsDisposalApply"==flowno){ businessType="1"; }else{ - if(orgId=="8009011"){ + if(orgId=="8009013"){ businessType="3"; }else if(orgId=="8009010"){ businessType="2"; diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp index fe8e45df4..9f33abcb1 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp @@ -5,7 +5,23 @@ /*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/ function newApply() { - AsDialog.OpenSelector("SelectAssetsDisposalForFee","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var flowno="<%=CurPage.getParameter("ApplyType")%>"; + var selname=""; + var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var businessType=""; + if("TAssetsDisposalFeeApply"==flowno){ + businessType="1"; + }else{ + if(orgId=="8009013"){ + businessType="3"; + }else if(orgId=="8009010"){ + businessType="2"; + }else{ + alert("µ±Ç°Óû§²»ÄÜ·¢ÆðÉêÇ룡"); + return; + } + } + AsDialog.OpenSelector("SelectAssetsDisposalForFee","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡ return; diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/businessApplyForfengxian.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/businessApplyForfengxian.java new file mode 100644 index 000000000..c4af90e43 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/businessApplyForfengxian.java @@ -0,0 +1,45 @@ +package com.tenwa.lease.flow.project.businessapply; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.tenwa.calc.LC_CALC_CONDITION; +import jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP; +import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; +import jbo.sys.USER_INFO; + +import com.amarsoft.app.lc.workflow.action.GetFlowAction; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; +import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; +import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; + +public class businessApplyForfengxian extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String userId = this.getAttribute("CurUserID").toString(); + + BizObjectManager userInfo = JBOFactory.getBizObjectManager(USER_INFO.CLASS_NAME, Sqlca); + BizObject condition = userInfo.createQuery("USERID=:userId").setParameter("userId",userId).getSingleResult(false); + String sMessage=""; + String applytype = null; + if(null!=condition){ + String orgid=condition.getAttribute("BELONGORG").toString(); + applytype = orgid.substring(0, 7); + } + if("8009013"==applytype||applytype.equals("8009013")){//ת¸øÒµÎñÒ»²¿ + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file