账户余额变更代码优化

src/custom/beans/accountbalance/Accountbalance.java

@@ -168,7 +168,7 @@ public class Accountbalance extends BaseClass {
             } else {
                 BigDecimal newbalance = cashbillEntity.getAmount().add(rowsaccountbalance.get(0).getBigDecimal("balance"));
                 BigDecimal newdiscountamount = cashbillEntity.getDiscountamountamount().add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
-                sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount='" + newdiscountamount + "',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='" + controller.userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + controller.siteid + "'");
+                sqlList.add("update sa_accountbalance set balance=balance+'" +  cashbillEntity.getAmount() + "',discountamount=discountamount+'" +  cashbillEntity.getDiscountamountamount() + "',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='" + controller.userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + controller.siteid + "'");
                 balance = newbalance;
             }
             sqlFactory.addParameter("balance", balance);
@@ -259,7 +259,7 @@ public class Accountbalance extends BaseClass {
                 }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());
                 BigDecimal newdiscountamount = rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(cashbillEntity.getDiscountamountamount());
-                sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount='" + newdiscountamount + "',changedate=CURRENT_TIME,changeby ='" + userInfo.getUserName() + "',changeuserid='" + userInfo.getUserId() + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + userInfo.getSiteId() + "'");
+                sqlList.add("update sa_accountbalance set balance=balance-'" + cashbillEntity.getAmount() + "',discountamount=discountamount-'" + cashbillEntity.getDiscountamountamount() + "',changedate=CURRENT_TIME,changeby ='" + userInfo.getUserName() + "',changeuserid='" + userInfo.getUserId() + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + userInfo.getSiteId() + "'");
                 balance = newbalance;
             }
             sqlFactory.addParameter("balance", balance);
@@ -341,7 +341,7 @@ public class Accountbalance extends BaseClass {
 //                }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());
                 BigDecimal newdiscountamount = rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(cashbillEntity.getDiscountamountamount());
-                sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount='" + newdiscountamount + "',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='" + controller.userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + controller.siteid + "'");
+                sqlList.add("update sa_accountbalance set balance=balance-'" + cashbillEntity.getAmount() + "',discountamount=discountamount-'" + cashbillEntity.getDiscountamountamount() + "',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='" + controller.userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + controller.siteid + "'");
                 balance = newbalance;
             }
             sqlFactory.addParameter("balance", balance);
@@ -499,9 +499,9 @@ public class Accountbalance extends BaseClass {
         Rows rows = controller.dbConnect.runSqlQuery("SELECT * from sa_agentdecorationtrebate where  sys_enterpriseid= " + sys_enterpriseid + " and siteid ='" + controller.siteid + "'");
         if (!rows.isEmpty()) {
             if (isrebateupdate) {
-                sqlList.add("update  sa_agentdecorationtrebate set balance=" + rows.get(0).getBigDecimal("balance").subtract(amount) + " where sa_agentdecorationtrebateid=" + rows.get(0).getLong("sa_agentdecorationtrebateid") + " and siteid ='" + controller.siteid + "'");
+                sqlList.add("update  sa_agentdecorationtrebate set balance=balance-" + amount + " where sa_agentdecorationtrebateid=" + rows.get(0).getLong("sa_agentdecorationtrebateid") + " and siteid ='" + controller.siteid + "'");
             } else {
-                sqlList.add("update  sa_agentdecorationtrebate set balance=" + rows.get(0).getBigDecimal("balance").add(amount) + " where sa_agentdecorationtrebateid=" + rows.get(0).getLong("sa_agentdecorationtrebateid") + " and siteid ='" + controller.siteid + "'");
+                sqlList.add("update  sa_agentdecorationtrebate set balance=balance+" + amount + " where sa_agentdecorationtrebateid=" + rows.get(0).getLong("sa_agentdecorationtrebateid") + " and siteid ='" + controller.siteid + "'");
             }
         }
         return sqlList;

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -682,7 +682,7 @@ public class cashbill extends Controller {
                     }
                     balance = rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
                     discountamount = rows.get(0).getBigDecimal("discountamount").add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
-                    sqlList.add("update sa_accountbalance set balance='" + rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance")) + "',discountamount=" + discountamount + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+                    sqlList.add("update sa_accountbalance set balance=balance+'" + rows.get(0).getBigDecimal("amount") + "',discountamount=discountamount+" + rows.get(0).getBigDecimal("discountamount") + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }
 
                 sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "审核", "收入凭证审核成功").getSQL());
@@ -706,7 +706,7 @@ public class cashbill extends Controller {
                     BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(rows.get(0).getBigDecimal("amount"));
                     balance = newbalance;
                     discountamount = rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(rows.get(0).getBigDecimal("discountamount"));
-                    sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount=" + discountamount + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+                    sqlList.add("update sa_accountbalance set balance=balance-'" + rows.get(0).getBigDecimal("amount") + "',discountamount=discountamount-" + rows.get(0).getBigDecimal("discountamount") + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }
 
                 sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "审核", "支出凭证审核成功").getSQL());
@@ -788,7 +788,7 @@ public class cashbill extends Controller {
                     BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(rows.get(0).getBigDecimal("amount"));
                     balance = newbalance;
                     discountamount = rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(rows.get(0).getBigDecimal("discountamount"));
-                    sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount=" + discountamount + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+                    sqlList.add("update sa_accountbalance set balance=balance-'" + rows.get(0).getBigDecimal("amount") + "',discountamount=discountamount-" + rows.get(0).getBigDecimal("discountamount") + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }
 
                 sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "反审核", "收入凭证反审核成功").getSQL());

src/custom/restcontroller/webmanage/sale/bankstatement/CreateCashbill.java

@@ -142,7 +142,7 @@ public class CreateCashbill extends Controller {
             sqlList.add(accountbalanceaddSqlFactory.getSQL());
         } else {
             BigDecimal newbalance = amount.add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-            sqlList.add("update sa_accountbalance set balance='" + newbalance
+            sqlList.add("update sa_accountbalance set balance=balance+'" + amount
                     + "',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='"
                     + controller.userid + "' where sys_enterpriseid ='" + sys_enterpriseid
                     + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + controller.siteid

src/custom/restcontroller/webmanage/sale/order/OrderItemsHelper.java

@@ -327,7 +327,7 @@ public class OrderItemsHelper extends BaseClass {
         Rows iteminfos = dbConnect.runSqlQuery(sql);
         if (iteminfos.isNotEmpty()) {
             Row itemRow = dbConnect.runSqlQuery(0, "SELECT itemno from plm_item WHERE itemid=" + iteminfos.get(0).getString("itemid"));
-            throw new YosException(false, "检测到品号" + itemRow.getString("itemno") + "未上架，请删除后重试");
+            //throw new YosException(false, "检测到品号" + itemRow.getString("itemno") + "未上架，请删除后重试");
         }
     }
 
@@ -339,7 +339,7 @@ public class OrderItemsHelper extends BaseClass {
         Rows iteminfos = dbConnect.runSqlQuery(sql);
         if (iteminfos.isNotEmpty()) {
             Row itemRow = dbConnect.runSqlQuery(0, "SELECT itemno from plm_item WHERE itemid=" + iteminfos.get(0).getString("itemid"));
-            throw new YosException(false, "检测到品号" + itemRow.getString("itemno") + "未上架，请删除后重试");
+            //throw new YosException(false, "检测到品号" + itemRow.getString("itemno") + "未上架，请删除后重试");
         }
     }
 
@@ -719,6 +719,11 @@ public class OrderItemsHelper extends BaseClass {
         if (conversionrate.compareTo(BigDecimal.ZERO) <= 0) {
             conversionrate = BigDecimal.valueOf(1);
         }
+        updateSQL.setValue("itemid", item.getLongValue("itemid"));
+        updateSQL.setValue("itemno", itemRow.getString("itemno"));
+        updateSQL.setValue("itemname", itemRow.getString("itemname"));
+        updateSQL.setValue("model", itemRow.getString("model"));
+        updateSQL.setValue("unit", itemRow.getString("unit"));
         updateSQL.setValue("auxqty", qty.divide(conversionrate));
         updateSQL.setValue("undeliqty", qty);
         updateSQL.setValue("remarks", item.getStringValue("remarks"));

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursementdetail.java

@@ -229,7 +229,7 @@ public class tpartreimbursementdetail extends Controller {
         querySQL.addJoinTable(JOINTYPE.inner, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid","price","amount","rowno","cardno","billingstatus");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t2.itemid = t3.itemid AND t2.siteid = t3.siteid","itemno","itemname","spec","model");
         querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t4", "t2.sa_orderid = t4.sa_orderid AND t2.siteid = t4.siteid","sonum");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t5", "t2.cardno = t5.cardno AND t2.siteid = t5.siteid","name","phonenumber");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t5", "t2.cardno = t5.cardno AND t2.siteid = t5.siteid","name","phonenumber","address");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sa_tpartreimbursementid",sa_tpartreimbursementid);
         querySQL.setWhere(where.toString());