Merge remote-tracking branch 'origin/develop' into develop

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

@@ -469,7 +469,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) {

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

@@ -2060,7 +2060,7 @@ public class Order extends Controller {
 //            CashbillEntity entity = getCashbillEntity(amount.negate(), sa_orderid, "订单退回", "由" + sonum + "订单退回时自动产生");
 //            sqlList.addAll(Accountbalance.createCashbillPay(this, pay_enterpriseid, sa_accountclassid, entity, true));
 //        }
-        JSONObject jsonObject = returnPayBill(row, "订单退回", sonum, "由" + sonum + "订单退回时自动产生");
+        JSONObject jsonObject = returnPayBill(row, "订单退回", sonum, "由订单号" + sonum + "退回时生成");
         sqlList.addAll(jsonObject.getJSONArray("sqlList").toJavaList(String.class));
         Long sa_cashbillid = jsonObject.getLong("sa_cashbillid");
 
@@ -2137,7 +2137,7 @@ public class Order extends Controller {
             sqlList.add(sqlFactory.getSQL());
         }
 
-        JSONObject jsonObject = returnPayBill(row, "订单撤回", sonum, "由" + sonum + "订单撤回时自动产生");
+        JSONObject jsonObject = returnPayBill(row, "订单撤回", sonum, "由订单号" + sonum + "撤回时生成");
         sqlList.addAll(jsonObject.getJSONArray("sqlList").toJavaList(String.class));
         Long sa_cashbillid = jsonObject.getLong("sa_cashbillid");
 

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

@@ -618,7 +618,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") + "结算时生成");
                 JSONObject cashbillIncome = Accountbalance.createCashbillIncome(this, sys_enterpriseid, sa_accountclassid, entity, true, true);
                 sqlList.addAll(cashbillIncome.getJSONArray("sqlList").toJavaList(String.class));
                 sa_cashbillid = cashbillIncome.getLong("sa_cashbillid");