From f00d9a17bb66e6a71ea1bae2eabea87b4c9f6cf4 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 16 Dec 2019 10:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=94=B6=E5=8F=96?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=A2=9E=E5=8A=A0=E5=A4=9A=E4=B8=BB=E4=BD=93?= =?UTF-8?q?=E8=B4=A6=E5=A5=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DealerDeposit/DDepositReturn_TempInfo.jsp | 2 +- .../serviceImp/CreateVoucherServiceImpl.java | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp index 1de91f61c..8f6a9b353 100644 --- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp +++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp @@ -28,7 +28,7 @@ } */ dwTemp.genHTMLObjectWindow(sFlowUnid); String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1"); - String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT WHERE limit 0,1"); + String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1"); String acc = Sqlca.getString("select acc_number from DISTRIBUTOR_ACCOUNT where distributor_id='"+DistributorNo+"' limit 0,1"); String subjectid = Sqlca.getString("SELECT cl.itemno AS subjectid FROM OWN_ACCOUNT oa LEFT JOIN CODE_LIBRARY CL ON CL.CODENO='ManySubject' AND CL.ITEMNAME=oa.acc_name WHERE oa.ACC_NUMBER='"+acc_number+"' limit 0,1"); diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 4a699896d..d495803b8 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -137,7 +137,7 @@ public class CreateVoucherServiceImpl { String OWN_NUMBER = ""; // 如果没有获取到主体信息， 出部分特殊要求，其它默认通过合同的id获取主体信息 - if(SUBJECTID==null || "".equals(SUBJECTID)) { + if(SUBJECTID==null || "".equals(SUBJECTID) || SUBJECTNAME==null || "".equals(SUBJECTNAME)) { if("PZ2018081600000120".equals(VOUCHERNO) || "PZ2018092500000155".equals(VOUCHERNO) || "PZ2019072000000071".equals(VOUCHERNO) || "PZ2019072000000072".equals(VOUCHERNO) || "PZ2019072000000073".equals(VOUCHERNO) || "PZ2018121800000005".equals(VOUCHERNO)) { String OWN_ACCOUNT= param.get("OWN_ACCOUNT"); BizObject ZT = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"SUBJECTNAME=:OWN_ACCOUNT").setParameter("OWN_ACCOUNT", OWN_ACCOUNT).getSingleResult(false); @@ -148,13 +148,7 @@ public class CreateVoucherServiceImpl { OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); } }else { - if(CONTRACT_ID==null || "".equals(CONTRACT_ID)) { - BizObject ZT = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"itemno=:itemno").setParameter("itemno", "aa740e4111c111eaaa0000163e0e11e6").getSingleResult(false); - SUBJECTID = "aa740e4111c111eaaa0000163e0e11e6"; - SUBJECTNAME = ZT.getAttribute("itemname").getString(); - BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); - OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); - }else { + if(CONTRACT_ID!=null && !"".equals(CONTRACT_ID)) { BizObject ZT = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"ID=:ID").setParameter("ID", CONTRACT_ID).getSingleResult(false); SUBJECTID = ZT.getAttribute("SUBJECTID").getString(); SUBJECTNAME = ZT.getAttribute("SUBJECTNAME").getString(); @@ -163,8 +157,19 @@ public class CreateVoucherServiceImpl { OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); } } + if(SUBJECTID==null || "".equals(SUBJECTID) || SUBJECTNAME==null || "".equals(SUBJECTNAME)) { + BizObject ZT = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"itemno=:itemno").setParameter("itemno", "aa740e4111c111eaaa0000163e0e11e6").getSingleResult(false); + SUBJECTID = "aa740e4111c111eaaa0000163e0e11e6"; + SUBJECTNAME = ZT.getAttribute("itemname").getString(); + BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); + OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); + } } } + if("PZ2018072100000032".equals(VOUCHERNO)) { + BizObject BF = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,"OWN_NAME=:OWN_NAME").setParameter("OWN_NAME", SUBJECTNAME).getSingleResult(false); + OWN_NUMBER = BF.getAttribute("OWN_NUMBER").getString(); + } param.put("F47", CONTRACT_NUMBER); // 合同编号 param.put("F48", OWN_NUMBER); // 账套（出租人编号） param.put("F49", SUBJECTID); // 所属主体id