凭证备注优化

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -466,7 +466,7 @@ public class aftersalesmag extends Controller {
                cashbillEntity.setAmount(returnamount);
                cashbillEntity.setOwnerid(sa_aftersalesmagid);
                cashbillEntity.setOwnertable("sa_aftersalesmag");
-               cashbillEntity.setRemarks("退货单号：" + rows.get(0).getString("billno") + ";订单号：" + rows.get(0).getString("sonum"));
+               cashbillEntity.setRemarks("由返退单号" + rows.get(0).getString("billno") + "复核时生成");
                cashbillEntity.setSource("退货单复核");
 
                if(sa_accountclassid==0){
@@ -581,7 +581,7 @@ public class aftersalesmag extends Controller {
                 cashbillEntity.setAmount(returnamount);
                 cashbillEntity.setOwnerid(sa_aftersalesmagid);
                 cashbillEntity.setOwnertable("sa_aftersalesmag");
-                cashbillEntity.setRemarks("退货单号：" + rows.get(0).getString("billno") + ";订单号：" + rows.get(0).getString("sonum"));
+                cashbillEntity.setRemarks("由返退单号" + rows.get(0).getString("billno") + "反复核时生成" );
                 cashbillEntity.setSource("退货单反复核");
                 if(!Accountbalance.judgeBalance(this, rows.get(0).getLong("sys_enterpriseid"), rows.get(0).getLong("sa_accountclassid"),returnamount)){
                     return getErrReturnObject().setErrMsg("经销商账户余额不足无法反复核")

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

@@ -1522,7 +1522,7 @@ public class Order extends Controller {
                     for (Object object : accountclassinfos) {
                         JSONObject jsonObject = (JSONObject) object;
                         if (Accountbalance.judgeBalance(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), jsonObject.getBigDecimal("amount"))) {
-                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单提交", sonum, "由" + sonum + "订单提交时，" + jsonObject.getString("accountname") + "账户自动支出产生");
+                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单提交", sonum, "由订单号" + sonum + "提交时生成");
                             //
                             if (accountclassrowsMap.containsKey(jsonObject.getString("sa_accountclassid")) && accountclassrowsMap.get(jsonObject.getString("sa_accountclassid")).isNotEmpty()) {
                                 jsonObject.put("balance", accountclassrowsMap.get(jsonObject.getString("sa_accountclassid")).get(0).getBigDecimal("balance").subtract(jsonObject.getBigDecimal("amount")));
@@ -1537,7 +1537,7 @@ public class Order extends Controller {
                     }
                 } else {
                     if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
-                        CashbillEntity entity = getCashbillEntity(amount, sa_orderid, "订单提交", sonum, "由" + sonum + "订单提交时自动产生");
+                        CashbillEntity entity = getCashbillEntity(amount, sa_orderid, "订单提交", sonum, "由订单号" + sonum + "提交时生成");
                         sqlList.addAll(Accountbalance.createCashbillPay(this, pay_enterpriseid, sa_accountclassid, entity, true));
                     } else {
                         return getErrReturnObject().setErrMsg("账户余额不足，还差" + Accountbalance.InsufficientBalance(this, pay_enterpriseid, sa_accountclassid, amount) + "元！").toString();
@@ -1712,7 +1712,7 @@ public class Order extends Controller {
                     for (Object object : accountclassinfos) {
                         JSONObject jsonObject = (JSONObject) object;
                         if (Accountbalance.judgeBalance(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), jsonObject.getBigDecimal("amount"))) {
-                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单审核", sonum, "由" + sonum + "订单审核时，" + jsonObject.getString("accountname") + "账户自动支出产生");
+                            CashbillEntity entity = getCashbillEntity(jsonObject.getBigDecimal("amount"), sa_orderid, "订单审核", sonum, "由订单号" + sonum + "审核时生成");
                             jsonObject.put("balance", jsonObject.getBigDecimalValue("balance").subtract(jsonObject.getBigDecimal("amount")));
                             sqlList.addAll(Accountbalance.createCashbillPay(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), entity, true));
                         } else {
@@ -1721,7 +1721,7 @@ public class Order extends Controller {
                     }
                 } else {
                     if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
-                        CashbillEntity entity = getCashbillEntity(amount, sa_orderid, "订单审核", sonum, "由" + sonum + "订单审核时自动产生");
+                        CashbillEntity entity = getCashbillEntity(amount, sa_orderid, "订单审核", sonum, "由订单号" + sonum + "审核时生成");
                         sqlList.addAll(Accountbalance.createCashbillPay(this, pay_enterpriseid, sa_accountclassid, entity, true));
                     } else {
                         return getErrReturnObject().setErrMsg("账户余额不足，还差" + Accountbalance.InsufficientBalance(this, pay_enterpriseid, sa_accountclassid, amount) + "元！").toString();
@@ -2025,7 +2025,7 @@ public class Order extends Controller {
 //            sqlList.addAll(Accountbalance.createCashbillPay(this, pay_enterpriseid, sa_accountclassid, entity, true));
 //        }
 
-        sqlList.addAll(returnPayBill(row, "订单退回", sonum, "由" + sonum + "订单退回时自动产生"));
+        sqlList.addAll(returnPayBill(row, "订单退回", sonum, "由订单号" + sonum + "退回时生成"));
 
         String message = "您的订单【" + sonum + "】已退回，退款金额为【" + amount + "】 已转入到您的资金账户";
 
@@ -2097,7 +2097,7 @@ public class Order extends Controller {
         }
 
 
-        sqlList.addAll(returnPayBill(row, "订单撤回", sonum, "由" + sonum + "订单撤回时自动产生"));
+        sqlList.addAll(returnPayBill(row, "订单撤回", sonum, "由订单号" + sonum + "撤回时生成"));
 
         String message = "您的订单【" + sonum + "】 金额为【" + amount + "】 已撤回！";
 
@@ -3224,7 +3224,7 @@ public class Order extends Controller {
                 entity.setSourcenote(orderRow.get(0).getString("sonum"));
                 entity.setOwnerid(sa_orderid);
                 entity.setOwnertable("sa_order");
-                entity.setRemarks("由" + orderRow.get(0).getString("sonum") + "订单手工关闭时自动产生");
+                entity.setRemarks("由订单号" + orderRow.get(0).getString("sonum") + "手工关闭时生成");
                 entity.setType("普通费用");
                 entity.setTypemx("订单关闭退款");
                 sqlList.addAll(Accountbalance.createCashbillPay(this, sys_enterpriseid, orderaccountclassinfo.getLongValue("sa_accountclassid"), entity, true));

src/custom/restcontroller/webmanage/sale/promotion/promotion.java

@@ -579,7 +579,7 @@ public class promotion extends Controller {
         Long sa_promotion_authid = content.getLong("sa_promotion_authid");
         ArrayList<String> sqlList = new ArrayList<>();
         Rows promotionauthRows = dbConnect.runSqlQuery(
-                "select t1.*,t2.type,t2.rebateratio,t2.promname from sa_promotion_auth t1 inner join sa_promotion t2 on t1.siteid=t2.siteid and t1.sa_promotionid=t2.sa_promotionid where t1.sa_promotion_authid ='"
+                "select t1.*,t2.type,t2.rebateratio,t2.promname,t2.promnum from sa_promotion_auth t1 inner join sa_promotion t2 on t1.siteid=t2.siteid and t1.sa_promotionid=t2.sa_promotionid where t1.sa_promotion_authid ='"
                         + sa_promotion_authid + "' and  t1.siteid='" + siteid + "'");
         if(promotionauthRows.isNotEmpty()){
             if(!promotionauthRows.get(0).getString("type").equals("返利促销")){
@@ -616,7 +616,7 @@ public class promotion extends Controller {
                entity.setOwnertable("sa_promotion_auth");
                entity.setSource("返利");
                entity.setSourcenote("经销商【"+agentnum+"】，【"+promotionauthRows.get(0).getString("promname")+"】方案返利促销");
-               entity.setRemarks("【"+promotionauthRows.get(0).getString("promname")+"】方案返利促销");
+               entity.setRemarks("由活动单号"+promotionauthRows.get(0).getString("promnum")+"结算时生成");
                sqlList.addAll(Accountbalance.createCashbillIncome(this, sys_enterpriseid,sa_accountclassid,entity,true,true));
                sqlList.add("update sa_promotion_auth set settlestatus=1 where sa_promotion_authid="+sa_promotion_authid+" and siteid='"+siteid+"'");
            }

src/custom/restcontroller/webmanage/sale/rebateaccount/rebateaccounthead.java

@@ -485,7 +485,7 @@ public class rebateaccounthead extends Controller {
                     entity.setOwnertable("sa_rebateaccount");
                     entity.setSource("返利");
                     entity.setSourcenote(rows.get(0).getString("billno")+"结算单返利");
-                    entity.setRemarks(rows.get(0).getString("billno")+"结算单装修补贴返利");
+                    entity.setRemarks("由装修返利结算单号"+rows.get(0).getString("billno")+"审核时生成");
                     sqlList.addAll(Accountbalance.createCashbillIncome(this, row.getLong("sys_enterpriseid"),sa_accountclassid,entity,true,true));
                     sqlList.addAll(Accountbalance.rebateupdate(this, row.getLong("sys_enterpriseid"), true, row.getBigDecimal("approvedamount")));
                 }
@@ -500,7 +500,7 @@ public class rebateaccounthead extends Controller {
                     entity.setOwnertable("sa_rebateaccount");
                     entity.setSource("返利");
                     entity.setSourcenote(rows.get(0).getString("billno")+"结算单反审核");
-                    entity.setRemarks("装修补贴返利反审核生成");
+                    entity.setRemarks("由装修返利结算单号"+rows.get(0).getString("billno")+"反审核时生成");
                     sqlList.addAll(Accountbalance.createCashbillIncome(this, row.getLong("sys_enterpriseid"),sa_accountclassid,entity,true,true));
                     sqlList.addAll(Accountbalance.rebateupdate(this, row.getLong("sys_enterpriseid"), false, row.getBigDecimal("approvedamount")));
                 }