From 3757d2a144eccaf3e5dc8aedd79f5fda9ae7648b Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 29 May 2019 09:54:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=A1=E5=8F=A3=E5=88=B0=E8=B4=A6=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E7=9A=84=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=92=8C=E7=A7=9F=E9=87=91=E5=AE=9E=E6=94=B6=E8=A1=A8=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml       |  1 +
 .../reckon/check/ChargebackVoucherTotal.java  | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 9bd039cf1..92d684cf2 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -1640,6 +1640,7 @@
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
 				<attribute name="penalty_reduce" label="减免罚息" type="STRING" length="32"/>
+				<attribute name="SPARE_BATCH_NO" label="扣款批次号" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java b/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java
index e0c2eecff..d46fb2dc3 100644
--- a/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java
+++ b/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java
@@ -1,7 +1,10 @@
 package com.tenwa.reckon.check;
 import java.util.List;
 
+import jbo.app.tenwa.calc.LC_RENT_INCOME;
 import jbo.app.tenwa.calc.LC_RENT_PLAN;
+import jbo.com.tenwa.lease.comm.VI_CHARGEBACKVOUCHERDETAIL;
+import jbo.com.tenwa.lease.comm.VI_CHARGEBACKVOUCHERTOTAL;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
@@ -32,21 +35,30 @@ public class ChargebackVoucherTotal{
 		 * �����κ����ظ�У��, û�����򱣴�
 		 */
 		public String saveBatchNo(JBOTransaction tx){
-			List<BizObject> rentList;
+		//	List<BizObject> rentList;
+			List<BizObject> bomList;
 			try {
 				// ����ʵ������, �����˺�, ��ѯ���ʵ������
-				rentList = JBOFactory.createBizObjectQuery(jbo.app.tenwa.calc.LC_RENT_INCOME.CLASS_NAME, "HIRE_DATE=:HIRE_DATE and OWN_NUMBER=:OWN_NUMBER").setParameter("HIRE_DATE", HIRE_DATE).setParameter("OWN_NUMBER", OWN_NUMBER).getResultList(false);
+		//		rentList = JBOFactory.createBizObjectQuery(jbo.app.tenwa.calc.LC_RENT_INCOME.CLASS_NAME, "HIRE_DATE=:HIRE_DATE and OWN_NUMBER=:OWN_NUMBER").setParameter("HIRE_DATE", HIRE_DATE).setParameter("OWN_NUMBER", OWN_NUMBER).getResultList(false);
+				// �������κŲ�ѯ���ʵ�ձ�����, У�����κ��Ƿ��ظ�
+				BizObjectManager rent_i = JBOFactory.getBizObjectManager(LC_RENT_INCOME.CLASS_NAME,tx);
+				BizObjectManager bom = JBOFactory.getBizObjectManager(VI_CHARGEBACKVOUCHERDETAIL.CLASS_NAME,tx);
+				bomList = bom.createQuery("HIRE_DATE=:HIRE_DATE and OWN_NUMBER=:OWN_NUMBER and CHANNEL=:CHANNEL").setParameter("HIRE_DATE",HIRE_DATE).setParameter("OWN_NUMBER",OWN_NUMBER).setParameter("CHANNEL",CHANNEL).getResultList(false);
 				
-				// �������κŲ�ѯ���ƻ�������, У�����κ��Ƿ��ظ�
-				BizObjectManager rent_p = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
-				BizObject checkSBN = rent_p.createQuery("SPARE_BATCH_NO=:SPARE_BATCH_NO").setParameter("SPARE_BATCH_NO",SPARE_BATCH_NO).getSingleResult(false);
+				BizObject checkSBN = rent_i.createQuery("SPARE_BATCH_NO=:SPARE_BATCH_NO").setParameter("SPARE_BATCH_NO",SPARE_BATCH_NO).getSingleResult(false);
 				if(checkSBN!=null){
 					return "���κ�"+SPARE_BATCH_NO+"�Ѵ��ڣ�";
 				}
-				
+				for(BizObject rentIncomeID:bomList){
+					String incomeId = rentIncomeID.getAttribute("income_ID").toString();
+					BizObject rii = rent_i.createQuery("ID=:ID").setParameter("ID", incomeId).getSingleResult(true);
+					rii.setAttributeValue("SPARE_BATCH_NO",SPARE_BATCH_NO);
+					rent_i.saveObject(rii);
+				}
+				//
 				//	List<BizObject> rentIDs = JBOFactory.createBizObjectQuery(jbo.com.tenwa.lease.comm.VI_CHARGEBACKVOUCHERTOTAL.CLASS_NAME, "HIRE_DATE=:HIRE_DATE and OWN_NUMBER=:OWN_NUMBER and CHANNEL=:CHANNEL").setParameter("HIRE_DATE", HIRE_DATE).setParameter("OWN_NUMBER", OWN_NUMBER).setParameter("CHANNEL", CHANNEL).getResultList(false);
 				// ��ѯ��ǰ���ο�������, �洢���κ������ƻ���
-				if(rentList.size()>0){
+				/*if(rentList.size()>0){
 					for(BizObject rentID:rentList){
 						String id = rentID.getAttribute("PLAN_ID").toString();
 						BizObject rent_p_jbo = rent_p.createQuery("COLLECT_STATUS=:COLLECT_STATUS and id=:id").setParameter("COLLECT_STATUS", COLLECT_STATUS).setParameter("id", id).getSingleResult(true);
@@ -56,7 +68,7 @@ public class ChargebackVoucherTotal{
 						rent_p_jbo.setAttributeValue("SPARE_BATCH_NO",SPARE_BATCH_NO);
 						rent_p.saveObject(rent_p_jbo);
 					}
-				}
+				}*/
 				
 				//����Ǹ��ĵĺ�����Ϣ��������Ӧ��VERIFICATIONSPARE����ҲҪ���ġ�(��������������, �˹�����ʱ�ò���)
 				if("Y".equals(this.checkSBN(tx))){