From cb23fae2ce688c30943f0c6519c61d735641bada Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Mon, 17 Feb 2020 18:52:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=EF=BC=88?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=9F=EF=BC=89=EF=BC=8C=E7=94=9F=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E6=AC=A1=E4=BB=98=E6=AC=BE=E6=98=8E=E7=BB=86=E6=97=B6=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=B1=BB=E5=9E=8B=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java
index cf7850473..e643a1003 100644
--- a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java
+++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java
@@ -16,6 +16,7 @@ import jbo.com.tenwa.lease.comm.LB_LESSOR_INFO;
 import jbo.com.tenwa.lease.comm.LB_TENANTRY_INFO;
 import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION;
 import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP;
+import jbo.sys.CODE_LIBRARY;
 
 import com.amarsoft.app.util.ProductParamUtil;
 import com.amarsoft.are.jbo.BizObject;
@@ -138,6 +139,7 @@ public class FundPayment {
 			String contractId = boLFPAMT.getAttribute("contract_id").toString();
 			BizObject boLLI = JBOFactory.createBizObjectQuery(LB_LESSOR_INFO.CLASS_NAME, "contract_id=:contractId").setParameter("contractId", contractId).getSingleResult(false);
 			BizObject boLTI = JBOFactory.createBizObjectQuery(LB_TENANTRY_INFO.CLASS_NAME, "contract_id=:contractId").setParameter("contractId", contractId).getSingleResult(false);
+			
 			String incomeID = UUIDUtil.getUUID();
 			BigDecimal outOverMoney = new BigDecimal(equipOverMoney);
 			tx.join(bomLFIT);
@@ -152,6 +154,9 @@ public class FundPayment {
 				}
 				String planID = funds[i].split("@")[0];
 				String inOvermoney = funds[i].split("@")[1];
+				String feeType = funds[i].split("@")[2];
+				BizObject boCL = JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME, "codeno=:codeno and itemno=:itemno").setParameter("codeno", "FeeType").setParameter("itemno", feeType).getSingleResult(false);
+				String feeTypeName = boCL.getAttribute("itemname").toString();
 				if(outOverMoney.compareTo(new BigDecimal(inOvermoney)) < 0){
 					inOvermoney = outOverMoney.toString();
 				}
@@ -193,7 +198,7 @@ public class FundPayment {
 				boLFITOut.setAttributeValue("APPLYPAY_DATE", boLFP.getAttribute("PLAN_DATE").getString());
 				boLFITOut.setAttributeValue("APPLY_PERSON", userId);
 				boLFITOut.setAttributeValue("APPLY_DEPT", orgId);
-				boLFITOut.setAttributeValue("MEMO", "抵扣设备款");
+				boLFITOut.setAttributeValue("MEMO", feeTypeName+"抵扣设备款");
 				boLFITOut.setAttributeValue("ROLL_BACK", 0);
 				boLFITOut.setAttributeValue("FLOWUNID", flowunid);
 				boLFITOut.setAttributeValue("IS_FLOWING", 0);