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 @@
+
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 rentList;
+ // List rentList;
+ List 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 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))){