返利结算单单号及备注信息优化

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

@@ -49,7 +49,7 @@ public class rebateaccounthead extends Controller {
         sqlFactory.addParameter("username", username);
         sqlFactory.addParameter("sa_rebateaccountheadid", sa_rebateaccountheadid);
         // 返利结算单号createBillCode("rebateaccountheadbill")
-        sqlFactory.addParameter("billno", "123456");
+        sqlFactory.addParameter("billno", createBillCode("rebateaccountheadbill"));
         sqlFactory.addParameter("billdate", billdate.equals("") ? "null" : billdate);
         sqlList.add(sqlFactory.getSQL());
         dbConnect.runSqlUpdate(sqlList);
@@ -390,8 +390,9 @@ public class rebateaccounthead extends Controller {
                 entity.setAmount(row.getBigDecimal("rebateamount"));
                 entity.setOwnerid(row.getLong("sa_rebateaccountid"));
                 entity.setOwnertable("sa_rebateaccount");
-                entity.setSource("");
-                entity.setRemarks("装修补贴返利生成");
+                entity.setSource("返利");
+                entity.setSourcenote(row.getString("billno")+"结算单返利");
+                entity.setRemarks(row.getString("billno")+"结算单装修补贴返利");
                 sqlList.addAll(Accountbalance.createCashbillIncome(this, row.getLong("sys_enterpriseid"),sa_accountclassid,entity,true));
                 sqlList.addAll(Accountbalance.rebateupdate(this, row.getLong("sys_enterpriseid"), true, row.getBigDecimal("rebateamount")));
             }
@@ -401,7 +402,8 @@ public class rebateaccounthead extends Controller {
                 entity.setAmount(row.getBigDecimal("rebateamount").negate());
                 entity.setOwnerid(row.getLong("sa_rebateaccountid"));
                 entity.setOwnertable("sa_rebateaccount");
-                entity.setSource("");
+                entity.setSource("返利");
+                entity.setSourcenote(row.getString("billno")+"结算单反审核");
                 entity.setRemarks("装修补贴返利反审核生成");
                 sqlList.addAll(Accountbalance.createCashbillIncome(this, row.getLong("sys_enterpriseid"),sa_accountclassid,entity,true));
                 sqlList.addAll(Accountbalance.rebateupdate(this, row.getLong("sys_enterpriseid"), false, row.getBigDecimal("rebateamount")));

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

@@ -40,7 +40,7 @@ public class rebatescheme  extends Controller {
         sqlFactory.addParameter("username", username);
         sqlFactory.addParameter("sa_rebateschemeid", sa_rebateschemeid);
         // 装修返利方案号createBillCode("rebateschemebill")
-        sqlFactory.addParameter("billno", "123456");
+        sqlFactory.addParameter("billno",createBillCode("rebateschemebill"));
         sqlList.add(sqlFactory.getSQL());
         dbConnect.runSqlUpdate(sqlList);