diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 899d0de8a..afba61bc7 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -1013,7 +1013,8 @@
-
+
+
@@ -1305,7 +1306,8 @@
-
+
+
diff --git a/calc/com/tenwa/flow/CopyDChargeTempToFormal.java b/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
index 792f3be98..495f9aa31 100644
--- a/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
@@ -30,11 +30,11 @@ public class CopyDChargeTempToFormal extends BaseBussiness{
DataOperatorUtil.copySingleJBO(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITCHARGE_INFO.CLASS_NAME, null, otherProperty, Sqlca);
BizObject dibo = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, Sqlca).createQuery("flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
BizObject deit = JBOFactory.createBizObjectQuery(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
- String num = dibo.getAttribute("TOTAL")==null?"0":dibo.getAttribute("TOTAL").getString();//.getString();
- BigDecimal total = new BigDecimal("".equals(num)?"0":num);
+ String num = dibo.getAttribute("SUMS")==null?"0":dibo.getAttribute("SUMS").getString();//.getString();
+ BigDecimal sums = new BigDecimal("".equals(num)?"0":num);
BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
- double num1 = total.add(cautionMoney).doubleValue();
- JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num1+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
+ double num1 = sums.add(cautionMoney).doubleValue();
+ JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set SUMS='"+num1+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
return "true";
}
diff --git a/calc/com/tenwa/flow/CopyDReturnTempToFormal.java b/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
index cc4bcb6e6..9f6fb8c9b 100644
--- a/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
@@ -37,10 +37,10 @@ public class CopyDReturnTempToFormal extends BaseBussiness {
DataOperatorUtil.copySingleJBO(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITRETURN_INFO.CLASS_NAME, null, otherProperty, Sqlca);
//ľܶ
- BigDecimal total = new BigDecimal(dst.getAttribute(DISTRIBUTOR_INFO_TEMP.TOTAL).getString());
+ BigDecimal sums = new BigDecimal(dst.getAttribute(DISTRIBUTOR_INFO_TEMP.SUMS).getString());
BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
- double num = total.subtract(cautionMoney).doubleValue();
- JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num+"' where distributor_no='"+disStatus+"'").executeUpdate();
+ double num = sums.subtract(cautionMoney).doubleValue();
+ JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set SUMS='"+num+"' where distributor_no='"+disStatus+"'").executeUpdate();
return "true";
}
}
diff --git a/src_sys/com/tenwa/flow/action/comm/SelectBalance.java b/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
index a84d96eb5..ae06d4778 100644
--- a/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
+++ b/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
@@ -42,7 +42,7 @@ public class SelectBalance {
Map params= new HashMap();
params.put("distributor_id", distributor_no);
//params.put("caution_money", caution_money);
- String sql="SELECT O.total AS money "
+ String sql="SELECT O.sums AS money "
+ "FROM DISTRIBUTOR_INFO O WHERE "
+ "O.distributor_no=:distributor_id";
List> getSql = DataOperatorUtil.getDataBySql(scql, sql, params);